Mercurial > hg > xemacs-beta

comparison configure.ac @ 5494:861f2601a38b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sync s/ files with GNU 23.1.92, delete obsolete stuff, simplify other stuff --- ChangeLog 2010-02-20 Ben Wing <ben@xemacs.org> * configure: * configure.ac (XE_EXPAND_VARIABLE): * configure.ac (TAB): irix6-0.h renamed to irix6-5.h; sco7.h deleted. bsd4-3.h renamed to bsd-common.h. Simplify setting machine= for intel386, mips. Put back linux.h. Incorporate some stuff about debug/optimization flags in irix6-5.h into configure.ac. Add a comment about LCC stuff with optimization flags that should be fixed up. --- src/ChangeLog 2010-02-20 Ben Wing <ben@xemacs.org> * sysdep.c: * sysdep.c (qxe_reliable_signal): * sysdep.c (retry_open_1): * sysdep.c (retry_close): * sysdep.c (retry_read_1): * sysdep.c (retry_write_1): * sysdep.c (retry_fopen): * sysdep.c (retry_fclose): * sysdep.c (retry_fread): * sysdep.c (retry_fwrite): Remove conditionalization on INTERRUPTIBLE_IO, INTERRUPTIBLE_OPEN, INTERRUPTIBLE_CLOSE -- always check for EINTR as there's no harm in it. Remove old #if 0'ed out SA_RESTART code. Use manifest constant IRIX6_5 instead of IRIX. * Makefile.in.in: * dired.c: * dired.c (Ffile_attributes): Use manifest constant IRIX6_5 instead of IRIX. Eliminate constant BSD4_2, use BSD4_3 instead. * getloadavg.c: * getloadavg.c (getloadavg): * getloadavg.c (LDAV_PRIVILEGED): * getloadavg.c (LDAV_DONE): Sync with GNU 23.1.92. 2010-02-20 Ben Wing <ben@xemacs.org> * s/README: * s/aix4-2.h: * s/aix4-2.h (MAIL_USE_LOCKF): * s/bsd-common.h: * s/freebsd.h: * s/freebsd.h (Carey): * s/freebsd.h (or): * s/gnu.h: * s/gnu.h (DATA_START): * s/hpux11-shr.h: * s/hpux11.h: * s/hpux11.h (random): * s/irix6-5.h: * s/linux.h: * s/mach-bsd4-3.h: * s/netbsd.h: * s/netbsd.h (or): * s/netbsd.h (A_TEXT_OFFSET): * s/netbsd.h (NO_MATHERR): * s/openbsd.h: * s/sol2.h: * s/usg5-4-2.h: * s/usg5-4.h: * s/usg5-4.h (or): * s/usg5-4.h (ORDINARY_LINK): Sync with GNU 23.1.92. Put back linux.h. Rename: bsd4-3.h -> bsd-common.h; irix6-0.h -> irix6-5.h. Delete: template.h (useless). Delete a whole bunch of obsolete stuff in sol2.h, linux.h, freebsd.h -- assume anything over 10 years old is sufficiently obsolete to be deleted. Remove LIBS_DEBUG, C_DEBUG_SWITCH, C_OPTIMIZE_SWITCH, KERNEL_FILE, LDAV_SYMBOL, most remaining PTY stuff, remaining TERMINFO/TERMCAP stuff. Update README appropriately. Remove stuff in hpux11-shr.h duplicated in hpux11.h. Remove sco7.h, identical with usg5-4-2.h. Remove unused POSIX flag, BROKEN_TIOC*, NO_SIOCTL_H. 2010-02-20 Ben Wing <ben@xemacs.org> * m/arm.h: * m/hp800.h: * m/intel386.h: * m/mips.h: * m/powerpc.h: * m/sparc.h: * m/template.h: Temporarily ifdef out all defines involving load-average stuff -- using define ENABLE_SM_FILE_DECLS_OF_LOADAVG_STUFF, which is not defined. I'm pretty sure getloadavg.c will take care of defining stuff properly on all systems without the need to duplicate the info in m/*. --ben Delete LIBS_TERMCAP; configure auto-handles this. Delete extra stuff in hp800.h. Delete C_DEBUG_SWITCH, C_OPTIMIZE_SWITCH, LDAV_SYMBOL; incorporate some stuff into configure.ac.
author Ben Wing <ben@xemacs.org>
date Sat, 20 Feb 2010 06:03:00 -0600
parents 2ade80e8c640
children 1f0b15040456
comparison
equal deleted inserted replaced
5493:f62141fe007d 5494:861f2601a38b
1318 1318
1319 dnl Straightforward machine determination 1319 dnl Straightforward machine determination
1320 case "$ac_cv_build" in 1320 case "$ac_cv_build" in
1321 sparc-*-* ) machine=sparc ;; 1321 sparc-*-* ) machine=sparc ;;
1322 alpha*-*-* ) machine=alpha ;; 1322 alpha*-*-* ) machine=alpha ;;
1323 mips*-linux ) machine=mips ;; 1323 mips*-* ) machine=mips ;;
1324 rs6000-ibm-aix* ) machine=ibmrs6000 ;; 1324 rs6000-ibm-aix* ) machine=ibmrs6000 ;;
1325 powerpc-ibm-aix* ) machine=ibmrs6000 ;; 1325 powerpc-ibm-aix* ) machine=ibmrs6000 ;;
1326 powerpc*-* ) machine=powerpc ;; 1326 powerpc*-* ) machine=powerpc ;;
1327 hppa-*-* ) machine=hp800 ;; 1327 hppa-*-* ) machine=hp800 ;;
1328 arm* ) machine=arm ;; 1328 arm* ) machine=arm ;;
1329 i[[3-9]]86-*-* ) machine=intel386 ;;
1329 esac 1330 esac
1330 1331
1331 dnl Straightforward OS determination 1332 dnl Straightforward OS determination
1332 case "$ac_cv_build" in 1333 case "$ac_cv_build" in
1334 *-*-linux* ) opsys=linux ;;
1333 *-*-netbsd* ) opsys=netbsd ;; 1335 *-*-netbsd* ) opsys=netbsd ;;
1334 *-*-openbsd* ) opsys=openbsd ;; 1336 *-*-openbsd* ) opsys=openbsd ;;
1335 1337
1336 dnl AIX 1338 dnl AIX
1337 *-*-aix[[4-9]]* ) opsys=aix4-2 ;; 1339 *-*-aix[[4-9]]* ) opsys=aix4-2 ;;
1338 1340
1339 dnl Other generic OSes 1341 dnl Other generic OSes
1340 *-gnu* ) opsys=gnu ;; 1342 *-gnu* ) opsys=gnu ;;
1341 *-*-bsd4.3 ) opsys=bsd4-3 ;; 1343 *-*-bsd4.3 ) opsys=bsd-common ;;
1342 *-*-aos* ) opsys=bsd4-3 ;; 1344 *-*-aos* ) opsys=bsd-common ;;
1343 *-*-sysv4.1* | *-*-sysvr4.1* )opsys=usg5-4 NON_GNU_CPP=/usr/lib/cpp ;; 1345 *-*-sysv4.1* | *-*-sysvr4.1* )opsys=usg5-4 NON_GNU_CPP=/usr/lib/cpp ;;
1344 *-*-sysv4.[[2-9]]* | *-sysvr4.[[2-9]]* ) 1346 *-*-sysv4.[[2-9]]* | *-sysvr4.[[2-9]]* )
1345 if test -z "$NON_GNU_CPP" ; then 1347 if test -z "$NON_GNU_CPP" ; then
1346 for prog in "/usr/ccs/lib/cpp" "/lib/cpp"; do 1348 for prog in "/usr/ccs/lib/cpp" "/lib/cpp"; do
1347 if test -f "$prog"; then NON_GNU_CPP="$prog"; break; fi 1349 if test -f "$prog"; then NON_GNU_CPP="$prog"; break; fi
1352 *-*-mach_bsd4.3* ) opsys=mach-bsd4-3 ;; 1354 *-*-mach_bsd4.3* ) opsys=mach-bsd4-3 ;;
1353 esac 1355 esac
1354 1356
1355 case "$ac_cv_build" in 1357 case "$ac_cv_build" in
1356 1358
1357 dnl NetBSD ports
1358 *-*-netbsd* )
1359 case "${ac_cv_build}" in
1360 i[[3-9]]86-*-netbsd*) machine=intel386 ;;
1361 esac
1362 ;;
1363
1364 dnl OpenBSD ports
1365 *-*-openbsd* )
1366 case "${ac_cv_build}" in
1367 i386-*-openbsd*) machine=intel386 ;;
1368 esac
1369 ;;
1370
1371 dnl Darwin, a.k.a. MacOS X (based on Mach and Freebsd) 1359 dnl Darwin, a.k.a. MacOS X (based on Mach and Freebsd)
1372 *-*-darwin*) 1360 *-*-darwin*)
1373 opsys=darwin 1361 opsys=darwin
1374 dnl Use this to set BSD correctly. 1362 dnl Use this to set BSD correctly.
1375 AC_DEFINE(USE_PARAM_H) 1363 AC_DEFINE(USE_PARAM_H)
1383 ;; 1371 ;;
1384 1372
1385 dnl Workstations sold by MIPS 1373 dnl Workstations sold by MIPS
1386 dnl This is not necessarily all workstations using the MIPS processor - 1374 dnl This is not necessarily all workstations using the MIPS processor -
1387 dnl Irises are produced by SGI, and DECstations by DEC. 1375 dnl Irises are produced by SGI, and DECstations by DEC.
1388 mips-mips-bsd* ) machine=mips opsys=bsd4-3 ;; 1376 mips-mips-bsd* ) opsys=bsd-common ;;
1389 mips-mips-* ) machine=mips opsys=usg5-4-2 ;; 1377 mips-mips-* ) opsys=usg5-4-2 ;;
1390 1378
1391 dnl Silicon Graphics machines 1379 dnl Silicon Graphics machines
1392 dnl Iris 4D 1380 dnl Iris 4D
1393 mips-sgi-irix6* ) opsys=irix6-0 ;; 1381 mips-sgi-irix6* ) opsys=irix6-5 ;;
1394 1382
1395 dnl Suns 1383 dnl Suns
1396 *-*-solaris* | *-sun-mach* | *-sun-bsd* ) 1384 *-*-solaris* | *-sun-mach* | *-sun-bsd* )
1397 dnl Hardware type
1398 case "$ac_cv_build" in
1399 i*86-*-* ) machine=intel386 ;;
1400 esac
1401
1402 dnl Make $canonical even more so. 1385 dnl Make $canonical even more so.
1403 case "$ac_cv_build" in *-sunos5*) 1386 case "$ac_cv_build" in *-sunos5*)
1404 ac_cv_build=`echo $ac_cv_build | sed -e s/sunos5/solaris2/`;; 1387 ac_cv_build=`echo $ac_cv_build | sed -e s/sunos5/solaris2/`;;
1405 esac 1388 esac
1406 1389
1420 esac 1403 esac
1421 os_release="${os_release_major}${os_release_minor}" 1404 os_release="${os_release_major}${os_release_minor}"
1422 AC_DEFINE_UNQUOTED(OS_RELEASE, $os_release) ;; 1405 AC_DEFINE_UNQUOTED(OS_RELEASE, $os_release) ;;
1423 1406
1424 *-mach* ) opsys=mach-bsd4-3 ;; 1407 *-mach* ) opsys=mach-bsd4-3 ;;
1425 * ) opsys=bsd4-3 ;; 1408 * ) opsys=bsd-common ;;
1426 esac 1409 esac
1427 1410
1428 dnl Watch out for a compiler guaranteed not to work. 1411 dnl Watch out for a compiler guaranteed not to work.
1429 test "$opsys $CC" = "sol2 /usr/ucb/cc" && CC="" 1412 test "$opsys $CC" = "sol2 /usr/ucb/cc" && CC=""
1430 ;; 1413 ;;
1431 1414
1432 dnl Intel 386 machines where we do not care about the manufacturer 1415 dnl Intel 386 machines where we do not care about the manufacturer
1433 i[[3-9]]86-*-* ) 1416 i[[3-9]]86-*-* )
1434 machine=intel386
1435 case "$ac_cv_build" in 1417 case "$ac_cv_build" in
1436 *-mach* ) opsys=mach-bsd4-3 ;; 1418 *-mach* ) opsys=mach-bsd4-3 ;;
1437 *-sysv5* ) opsys=sco7 ;; 1419 *-sysv5* ) opsys=usg5-4-2 ;;
1438 *-freebsd* ) opsys=freebsd ;; 1420 *-freebsd* ) opsys=freebsd ;;
1439 *-pc-cygwin* ) opsys=cygwin32 ;; 1421 *-pc-cygwin* ) opsys=cygwin32 ;;
1440 *-pc-mingw* ) opsys=mingw32 ; 1422 *-pc-mingw* ) opsys=mingw32 ;
1441 test -z "$with_tty" && with_tty="no";; 1423 test -z "$with_tty" && with_tty="no";;
1442 dnl Otherwise, we fall through to the generic opsys code at the bottom. 1424 dnl Otherwise, we fall through to the generic opsys code at the bottom.
1988 elif test "$CC" = "xlc"; then 1970 elif test "$CC" = "xlc"; then
1989 dnl see http://www.nersc.gov/vendor_docs/ibm/vac/sc094959.pdf 1971 dnl see http://www.nersc.gov/vendor_docs/ibm/vac/sc094959.pdf
1990 with_cflags_optimization="-O3 -qstrict -qnoansialias -qlibansi -qmaxmem=20000" 1972 with_cflags_optimization="-O3 -qstrict -qnoansialias -qlibansi -qmaxmem=20000"
1991 elif test "$__ICC" = "yes"; then 1973 elif test "$__ICC" = "yes"; then
1992 with_cflags_optimization="-O3 -Ob2" 1974 with_cflags_optimization="-O3 -Ob2"
1975 elif test "$opsys" = "irix6-5"; then
1976 dnl Optimize, inaccurate debugging, increase limit on size of what's
1977 dnl optimized.
1978 dnl
1979 dnl This should also be applicable other than on Irix 6.5, but I don't
1980 dnl know for which compiler versions. -- fx
1981 with_cflags_optimization="-O -OPT:Olimit=3500"
1982 dnl #### FIXME FOR LCC:
1983 dnl elif test "USE_LCC" = "yes"; then
1984 dnl with_cflags_optimization="-O4 -Oi"
1993 dnl ### Add optimal cflags_optimization support for other compilers HERE! 1985 dnl ### Add optimal cflags_optimization support for other compilers HERE!
1994 else 1986 else
1995 with_cflags_optimization="-O" ;dnl The only POSIX-approved flag 1987 with_cflags_optimization="-O" ;dnl The only POSIX-approved flag
1996 fi 1988 fi
1997 elif test "$XEMACS_CC_GPP" = "yes" ; then 1989 elif test "$XEMACS_CC_GPP" = "yes" ; then
2004 1996
2005 AC_MSG_RESULT([${with_cflags_optimization}]) 1997 AC_MSG_RESULT([${with_cflags_optimization}])
2006 1998
2007 AC_MSG_CHECKING([for preferred debugging flags]) 1999 AC_MSG_CHECKING([for preferred debugging flags])
2008 if test "$cflags_debugging_specified" = "no"; then 2000 if test "$cflags_debugging_specified" = "no"; then
2001 if test "$GCC" = "no" -a "$opsys" = "irix6-5" -a "$with_optimization" = "yes" ; then
2002 dnl MIPSpro C special debugging stuff for use with optimization
2003 with_cflags_debugging="-g3"
2009 dnl ### Add optimal debugging support for other compilers HERE! 2004 dnl ### Add optimal debugging support for other compilers HERE!
2010 with_cflags_debugging="-g" 2005 else
2006 with_cflags_debugging="-g"
2007 fi
2011 2008
2012 debugging_ok_with_optimization=no 2009 debugging_ok_with_optimization=no
2013 if test "$GCC" = "yes" -o "$CC" = "xlc" -o "$__ICC" = "yes"; then 2010 if test "$GCC" = "yes" -o "$CC" = "xlc" -o "$__ICC" = "yes" -o "$opsys" = "irix6-5"; then
2014 debugging_ok_with_optimization=yes 2011 debugging_ok_with_optimization=yes
2015 fi 2012 fi
2016 2013
2017 if test "$with_optimization" = "yes" -a "$debugging_ok_with_optimization" = "no"; then 2014 if test "$with_optimization" = "yes" -a "$debugging_ok_with_optimization" = "no"; then
2018 with_cflags_debugging= 2015 with_cflags_debugging=
4477 if test "$ac_cv_header_stropts_h" = "yes"; then 4474 if test "$ac_cv_header_stropts_h" = "yes"; then
4478 AC_CHECK_FUNCS(isastream) 4475 AC_CHECK_FUNCS(isastream)
4479 AC_CHECK_HEADERS(strtio.h) dnl TIOCSIGNAL 4476 AC_CHECK_HEADERS(strtio.h) dnl TIOCSIGNAL
4480 fi 4477 fi
4481 4478
4479 dnl There is also AC_FUNC_GETLOADAVG; why don't we use it?
4482 dnl Check whether the system provides getloadavg(). 4480 dnl Check whether the system provides getloadavg().
4483 AC_CHECK_FUNCS(getloadavg) 4481 AC_CHECK_FUNCS(getloadavg)
4484 4482
4485 if test "$ac_cv_func_getloadavg" = "yes"; then 4483 if test "$ac_cv_func_getloadavg" = "yes"; then
4486 dnl Solaris 8 declares getloadavg() in <sys/loadavg.h>. 4484 dnl Solaris 8 declares getloadavg() in <sys/loadavg.h>.