diff -dur gcl-2.6.7.ORIG/acconfig.h gcl-2.6.7/acconfig.h --- gcl-2.6.7.ORIG/acconfig.h 2008-11-19 07:12:54.000000000 -0700 +++ gcl-2.6.7/acconfig.h 2008-11-19 07:13:33.000000000 -0700 @@ -1,3 +1,6 @@ +/* Whether compiling on a glibc-based system */ +#undef _GNU_SOURCE + /* define where the heap could begin. Normally should be the smallest value returned by sbrk(). Underestimating by 10-20 megabytes is not a problem. */ @@ -53,11 +56,10 @@ #undef HAVE_ALLOCA #endif - /* define if need alloca.h */ -#undef NEED_ALLOCA_H +#undef HAVE_ALLOCA_H -#ifdef NEED_ALLOCA_H +#ifdef HAVE_ALLOCA_H #include #endif @@ -159,7 +161,6 @@ #ifdef IN_NUM_CO #ifdef HAVE_ISNORMAL -#define _GNU_SOURCE #include #define ISNORMAL(a) isnormal(a) #else @@ -180,7 +181,6 @@ #ifdef NEED_ISFINITE #ifdef HAVE_ISFINITE -#define _GNU_SOURCE #include #define ISFINITE(a) isfinite(a) #else diff -dur gcl-2.6.7.ORIG/configure.in gcl-2.6.7/configure.in --- gcl-2.6.7.ORIG/configure.in 2008-11-19 07:12:54.000000000 -0700 +++ gcl-2.6.7/configure.in 2008-11-19 07:17:14.000000000 -0700 @@ -11,25 +11,39 @@ # help="--enable-maxpage=XXXX will compile in a page table of size XXX (default ${default_maxpage})" -AC_ARG_ENABLE(maxpage,[ --enable-maxpage=XXXX will compile in a page table of size XXX (eg '--enable-maxpage=64*1024' would give 64K pages allowing 256 MB if pages are 4K each)] , +AC_ARG_ENABLE(maxpage, + [AS_HELP_STRING([--enable-maxpage=XXXX], + [will compile in a page table of size XXX (eg '--enable-maxpage=64*1024' would give 64K pages allowing 256 MB if pages are 4K each)])], [AC_DEFINE_UNQUOTED(MAXPAGE,$enable_maxpage)]) -AC_ARG_ENABLE(holepage,[ --enable-holepage=XXXX will compile in a XXX-sized hole between the heap and relocatable memory area (eg '--enable-holepage=64*1024' would give 64K pages allowing 256 MB if pages are 4K each)] , +AC_ARG_ENABLE(holepage, + [AS_HELP_STRING([--enable-holepage=XXXX], + [will compile in a XXX-sized hole between the heap and relocatable memory area (eg '--enable-holepage=64*1024' would give 64K pages allowing 256 MB if pages are 4K each)])], [AC_DEFINE_UNQUOTED(HOLEPAGE,$enable_holepage)]) -AC_ARG_ENABLE(vssize,[ --enable-vssize=XXXX will compile in a value stack of size XXX] , +AC_ARG_ENABLE(vssize, + [AS_HELP_STRING([--enable-vssize=XXXX], + [will compile in a value stack of size XXX])], [AC_DEFINE_UNQUOTED(VSSIZE,$enable_vssize)]) -AC_ARG_ENABLE(bdssize,[ --enable-bdssize=XXXX will compile in a binding stack of size XXX] , +AC_ARG_ENABLE(bdssize, + [AS_HELP_STRING([--enable-bdssize=XXXX], + [will compile in a binding stack of size XXX])], [AC_DEFINE_UNQUOTED(BDSSIZE,$enable_bdssize)]) -AC_ARG_ENABLE(ihssize,[ --enable-ihssize=XXXX will compile in a invocation history stack of size XXX] , +AC_ARG_ENABLE(ihssize, + [AS_HELP_STRING([--enable-ihssize=XXXX], + [will compile in a invocation history stack of size XXX])], [AC_DEFINE_UNQUOTED(IHSSIZE,$enable_ihssize)]) -AC_ARG_ENABLE(frssize,[ --enable-frssize=XXXX will compile in a frame stack of size XXX] , +AC_ARG_ENABLE(frssize, + [AS_HELP_STRING([--enable-frssize=XXXX], + [will compile in a frame stack of size XXX])], [AC_DEFINE_UNQUOTED(FRSSIZE,$enable_frssize)]) -AC_ARG_ENABLE(machine,[ --enable-machine=XXXX will force the use of one of the definitions in h/XXXX.defs] , +AC_ARG_ENABLE(machine, + [AS_HELP_STRING([--enable-machine=XXXX], + [will force the use of one of the definitions in h/XXXX.defs])], [enable_machine=$enableval],[enable_machine=""]) #AC_ARG_ENABLE(gmp,[ --enable-gmp=no will disable use of GMP gnu multiprecision arithmetic, (default is =yes)] , @@ -37,38 +51,53 @@ use_gmp="yes" -AC_ARG_ENABLE(notify,[ --enable-notify=no will disable the automatic notification of gcl maintainers of successful builds/problems] , +AC_ARG_ENABLE(notify, + [AS_HELP_STRING([--enable-notify=no], + [will disable the automatic notification of gcl maintainers of successful builds/problems])], [enable_notify=$enableval],[enable_notify="yes"]) -AC_ARG_ENABLE(tkconfig,[ --enable-tkconfig=XXXX will force the use of a TK_CONFIG_PREFIX=XXXXX as place to look for tkConfig.sh and tclConfig.sh ] , +AC_ARG_ENABLE(tkconfig, + [AS_HELP_STRING([--enable-tkconfig=XXXX], + [will force the use of a TK_CONFIG_PREFIX=XXXXX as place to look for tkConfig.sh and tclConfig.sh])], [TK_CONFIG_PREFIX=$enableval],[TK_CONFIG_PREFIX="unknown"]) - -AC_ARG_ENABLE(tclconfig,[ --enable-tclconfig=XXXX will force the use of a TCL_CONFIG_PREFIX=XXXXX as place to look for tclConfig.sh and tclConfig.sh ] , +AC_ARG_ENABLE(tclconfig, + [AS_HELP_STRING([--enable-tclconfig=XXXX], + [will force the use of a TCL_CONFIG_PREFIX=XXXXX as place to look for tclConfig.sh and tclConfig.sh])], [TCL_CONFIG_PREFIX=$enableval],[TCL_CONFIG_PREFIX="unknown"]) -AC_ARG_ENABLE(infodir,[ --enable-infodir=XXXX will force the use of a INFO_DIR=XXXXX as place to look for info ] , +AC_ARG_ENABLE(infodir, + [AS_HELP_STRING([--enable-infodir=XXXX], + [will force the use of a INFO_DIR=XXXXX as place to look for info])], [INFO_DIR=$enableval],[INFO_DIR=$prefix/share/info]) INFO_DIR=`eval echo $INFO_DIR/` -AC_ARG_ENABLE(emacsdir,[ --enable-emacsdir=XXXX will manually specify the location for elisp files ] , +AC_ARG_ENABLE(emacsdir, + [AS_HELP_STRING([--enable-emacsdir=XXXX], + [will manually specify the location for elisp files])], [EMACS_SITE_LISP=$enableval],[EMACS_SITE_LISP=$prefix/share/emacs/site-lisp]) EMACS_SITE_LISP=`eval echo $EMACS_SITE_LISP/` -AC_ARG_ENABLE(common-binary,[ --enable-common-binary=yes forces use of lowest common denominator instruction sets, (default is =yes)] , +AC_ARG_ENABLE(common-binary, + [AS_HELP_STRING([--enable-common-binary=yes], + [forces use of lowest common denominator instruction sets, (default is =yes)])], [use_common_binary=$enableval],[use_common_binary="yes"]) -AC_ARG_ENABLE(japi,[ --enable-japi=yes will compile in support for the JAPI graphical interface if present on your system], +AC_ARG_ENABLE(japi, + [AS_HELP_STRING([--enable-japi=yes], + [will compile in support for the JAPI graphical interface if present on your system])], [try_japi=$enableval],[try_japi="no"]) -AC_ARG_ENABLE(xdr,[ --enable-xdr=yes will compile in support for XDR], +AC_ARG_ENABLE(xdr, + [AS_HELP_STRING([--enable-xdr=yes],[will compile in support for XDR])], [try_xdr=$enableval],[try_xdr="no"]) -AC_ARG_ENABLE(xgcl,[ --enable-xgcl=yes will compile in support for XGCL], +AC_ARG_ENABLE(xgcl, + [AS_HELP_STRING([--enable-xgcl=yes],[will compile in support for XGCL])], [enable_xgcl=$enableval],[enable_xgcl="yes"]) # -# Host information +# Host information # @@ -78,7 +107,7 @@ my_host_system=`echo $host_os | awk '{j=split($1,A,"-");if (j>=2) print A[[2]]}'` AC_DEFINE_UNQUOTED(HOST_CPU,"`echo $host_cpu | awk '{print toupper($0)}'`") AC_DEFINE_UNQUOTED(HOST_KERNEL,"`echo $my_host_kernel | awk '{print toupper($0)}'`") -if test "$my_host_system" != "" ; then +if test "$my_host_system" != "" ; then AC_DEFINE_UNQUOTED(HOST_SYSTEM,"`echo $my_host_system | awk '{print toupper($0)}'`") fi ## host=CPU-COMPANY-SYSTEM @@ -104,38 +133,38 @@ host=m68020-unknown-linux-gnu echo "The host is canonicalised to $host" fi - use=m68k-linux;; + use=m68k-linux;; alpha*linux*) - use=alpha-linux;; + use=alpha-linux;; mips*linux*) - use=mips-linux;; + use=mips-linux;; mipsel*linux*) - use=mipsel-linux;; + use=mipsel-linux;; sparc*linux*) - use=sparc-linux;; + use=sparc-linux;; arm*linux*) - use=arm-linux;; + use=arm-linux;; s390*linux*) - use=s390-linux;; + use=s390-linux;; ia64*linux*) - use=ia64-linux;; + use=ia64-linux;; hppa*linux*) - use=hppa-linux;; + use=hppa-linux;; powerpc*linux*) - use=powerpc-linux;; + use=powerpc-linux;; powerpc-*-darwin*) - use=powerpc-macosx;; - + use=powerpc-macosx;; + alpha-dec-osf) use=alpha-osf1;; @@ -166,7 +195,7 @@ IRIX3*) use=sgi4d;; esac ;; - + m68k-apple-aux*) use=mac2;; @@ -252,7 +281,7 @@ # 'ld -Z' means disable W^X TLDFLAGS="$TLDFLAGS -Z" use=FreeBSD;; - + esac AC_SUBST(PROCESSOR_FLAGS) @@ -270,7 +299,7 @@ def_pic="no"; def_static="no"; def_debug="no"; -case $use in +case $use in *linux) ln -snf linux.defs h/$use.defs; case $use in @@ -279,7 +308,7 @@ mips*) def_dlopen="yes" ; def_pic="yes" ; def_statsysbfd="no" ;; # def_static -- Function descriptors are currently realized at runtime in a non-reproducible fashion -# on these architectures -- CM +# on these architectures -- CM ia64*) def_dlopen="yes" ; def_statsysbfd="no" ; def_static="no" ;; hppa*) @@ -296,39 +325,49 @@ esac AC_ARG_ENABLE(dlopen, - [ --enable-dlopen uses dlopen for loading objects, which can then not be retained in saved images ] - ,,enable_dlopen="$def_dlopen") + [AS_HELP_STRING([--enable-dlopen], + [uses dlopen for loading objects, which can then not be retained in saved images])] + ,,enable_dlopen="$def_dlopen") AC_ARG_ENABLE(statsysbfd, - [ --enable-statsysbfd uses a static sytem bfd library for loading and relocationing object files ] - ,,enable_statsysbfd="$def_statsysbfd") + [AS_HELP_STRING([--enable-statsysbfd], + [uses a static sytem bfd library for loading and relocating object files])] + ,,enable_statsysbfd="$def_statsysbfd") AC_ARG_ENABLE(dynsysbfd, - [ --enable-dynsysbfd uses a dynamic shared sytem bfd library for loading and relocationing object files ] - ,,enable_dynsysbfd="no") + [AS_HELP_STRING([--enable-dynsysbfd], + [uses a dynamic shared sytem bfd library for loading and relocating object files])] + ,,enable_dynsysbfd="no") AC_ARG_ENABLE(locbfd, - [ --enable-locbfd uses a static bfd library built from this source tree for loading and relocationing object files ] - ,,enable_locbfd="$def_locbfd") + [AS_HELP_STRING([--enable-locbfd], + [uses a static bfd library built from this source tree for loading and relocating object files])] + ,,enable_locbfd="$def_locbfd") AC_ARG_ENABLE(custreloc, - [ --enable-custreloc uses custom gcl code if available for loading and relocationing object files ] - ,,enable_custreloc="$def_custreloc") + [AS_HELP_STRING([--enable-custreloc], + [uses custom gcl code if available for loading and relocating object files])] + ,,enable_custreloc="$def_custreloc") AC_ARG_ENABLE(debug, - [ --enable-debug builds gcl with -g in CFLAGS to enable running under gdb ] - ,,enable_debug="$def_debug") + [AS_HELP_STRING([--enable-debug], + [builds gcl with -g in CFLAGS to enable running under gdb])] + ,,enable_debug="$def_debug") AC_ARG_ENABLE(gprof, - [ --enable-gprof builds gcl with -pg in CFLAGS to enable profiling with gprof ] - ,,enable_gprof="no") -AC_ARG_ENABLE(static,[ --enable-static will link your GCL against static as opposed to shared system libraries ] , - [enable_static=$enableval],[enable_static="$def_static"]) + [AS_HELP_STRING([--enable-gprof], + [builds gcl with -pg in CFLAGS to enable profiling with gprof])] + ,,enable_gprof="no") +AC_ARG_ENABLE(static, + [AS_HELP_STRING([--enable-static], + [will link your GCL against static as opposed to shared system libraries])], + [enable_static=$enableval],[enable_static="$def_static"]) AC_ARG_ENABLE(pic, - [ --enable-pic builds gcl with -fPIC in CFLAGS ] - ,,enable_pic="$def_pic") + [AS_HELP_STRING([--enable-pic],[builds gcl with -fPIC in CFLAGS])] + ,,enable_pic="$def_pic") AC_ARG_ENABLE(oldgmp, - [ --enable-oldgmp will link against gmp2 instead of gmp3 ] - ,,enable_oldgmp="$def_oldgmp") + [AS_HELP_STRING([--enable-oldgmp],[will link against gmp2 instead of gmp3])] + ,,enable_oldgmp="$def_oldgmp") AC_ARG_ENABLE(dynsysgmp, - [ --enable-dynsysgmp will link against the system libgmp3 overriding certain functions with patched versions from the local source ] - ,,enable_dynsysgmp="yes") + [AS_HELP_STRING([--enable-dynsysgmp], + [will link against the system libgmp3 overriding certain functions with patched versions from the local source])] + ,,enable_dynsysgmp="yes") load_opt="0" if test "$enable_dlopen" = "yes" ; then @@ -379,12 +418,12 @@ ## #if test "$use" = "unknown" ; then #types=`echo h/*.defs` | sed -e "s:h/::g" -e "s:\.defs:g"` -#echo got canonical=$canonical, but was not recognized. -#echo Unable to guess type to use. Try one of +#echo got canonical=$canonical, but was not recognized. +#echo Unable to guess type to use. Try one of #exit(1) #fi -AC_MSG_RESULT([use=$use]) +AC_MSG_RESULT([use=$use]) # @@ -400,6 +439,7 @@ LDFLAGS=" " fi +AC_GNU_SOURCE AC_PROG_CC AC_PROG_CPP AC_SUBST(CC) @@ -457,7 +497,7 @@ case $use in mips*) enable_gprof="no";; hppa*) enable_gprof="no";; -esac +esac if test "$enable_gprof" = "yes" ; then TCFLAGS="$TCFLAGS -pg"; @@ -471,8 +511,8 @@ rm -f foo.c foo AC_MSG_RESULT($GCL_GPROF_START) AC_DEFINE_UNQUOTED(GCL_GPROF_START,$GCL_GPROF_START) - case "$use" in - arm*) + case "$use" in + arm*) #FIXME report and remove this when done AC_MSG_RESULT(Reducing optimization on profiling arm build to workaround gcc bug) enable_debug=yes;; @@ -497,11 +537,11 @@ # gcc on ppc cannot compile our new_init.c with full opts --CM TONIFLAGS="" -case $use in +case $use in *linux) case $use in # amd64*) # stack-boundary option does not work -# TCFLAGS="$TCFLAGS -m64 -mpreferred-stack-boundary=8";; +# TCFLAGS="$TCFLAGS -m64 -mpreferred-stack-boundary=8";; alpha*) TCFLAGS="$TCFLAGS -mieee";; # m68k*) @@ -516,7 +556,7 @@ if test "$enable_debug" != "yes" ; then TO3FLAGS="-O2" ; fi if test "$enable_debug" != "yes" ; then TO2FLAGS="-O" ; fi ;; - powerpc*) + powerpc*) if $CC -v 2>&1 | grep -q "gcc version 3.2" ; then echo Reducing optimization for buggy gcc-3.2 if test "$enable_debug" != "yes" ; then TONIFLAGS="-O $TFPFLAG" ; fi @@ -534,6 +574,9 @@ TCFLAGS="$TCFLAGS -fPIC" fi +AC_PROG_EGREP +AC_CHECK_PROGS(MAKEINFO,makeinfo,"false") +AC_SUBST(MAKEINFO) # Step 1: set the variable "system" to hold the name and version number # for the system. This can usually be done via the "uname" command, but @@ -542,9 +585,6 @@ AC_MSG_CHECKING([system version (for dynamic loading)]) if machine=`uname -m` ; then true; else machine=unknown ; fi -AC_CHECK_PROGS(MAKEINFO,makeinfo,"false") -AC_SUBST(MAKEINFO) - if test -f /usr/lib/NextStep/software_version; then system=NEXTSTEP-`${AWK} '/3/,/3/' /usr/lib/NextStep/software_version` else @@ -555,7 +595,7 @@ else # Special check for weird MP-RAS system (uname returns weird # results, and the version is kept in special file). - + if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then system="MP-RAS-`${AWK} '{print $3}' '/etc/.relid'`" fi @@ -576,19 +616,18 @@ AC_CHECK_HEADER(unistd.h, AC_CHECK_LIB(c,sysconf, - AC_MSG_CHECKING("for _SC_CLK_TCK") - AC_TRY_RUN([#include - #include - int - main() { - FILE *fp=fopen("conftest1","w"); + AC_MSG_CHECKING([for _SC_CLK_TCK]) + AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + #include + #include + ]],[[ + FILE *fp=fopen("conftest1","w"); fprintf(fp,"%lu\n",sysconf(_SC_CLK_TCK)); fclose(fp); - return 0; - }], - hz=`cat conftest1` - AC_DEFINE_UNQUOTED(HZ,$hz) - ,hz=0,hz=0) + return 0;]])], + hz=`cat conftest1` + AC_DEFINE_UNQUOTED(HZ,$hz) + ,hz=0,hz=0) [AC_MSG_RESULT($hz)])) @@ -608,17 +647,18 @@ if test "$enable_dynsysgmp" = "yes" ; then AC_CHECK_HEADER(gmp.h, AC_CHECK_LIB(gmp,__gmpz_init, - AC_MSG_CHECKING("for external gmp version") - AC_TRY_RUN([#include - int main() { - #if __GNU_MP_VERSION == 4 - return 0; - #else - return -1; - #endif - }], + AC_MSG_CHECKING([for external gmp version]) + AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + #include + ]],[[ + #if __GNU_MP_VERSION == 4 + return 0; + #else + return -1; + #endif]])], # MPFILES=$GMPDIR/mpn/mul_n.o # PATCHED_SYMBOLS=__gmpn_toom3_mul_n + AC_MSG_RESULT(4) MPFILES= PATCHED_SYMBOLS= if test "$use" = "m68k-linux" ; then @@ -630,20 +670,21 @@ echo "int main() {return 0;}" >>foo.c MP_INCLUDE=`cpp foo.c | grep /gmp.h | head -n 1 | $AWK '{print $3}' | tr -d '"'` rm -f foo.c, - echo "Cannot use dynamic gmp lib" , echo "Cannot use dynamic gmp lib" ), + AC_MSG_RESULT([Cannot use dynamic gmp lib]), + AC_MSG_RESULT([Cannot use dynamic gmp lib])), echo "Cannot use dynamic gmp lib" ,), echo "Cannot use dynamic gmp lib" ,) fi NEED_LOCAL_GMP='' -if test "$MP_INCLUDE" = "" ; then +if test "$MP_INCLUDE" = "" ; then NEED_LOCAL_GMP=1; fi -if test "$PATCHED_SYMBOLS" != "" ; then +if test "$PATCHED_SYMBOLS" != "" ; then NEED_LOCAL_GMP=1; fi -if test "$NEED_LOCAL_GMP" != "" ; then +if test "$NEED_LOCAL_GMP" != "" ; then AC_MSG_CHECKING([use_gmp=yes, doing configure in gmp directory]) echo @@ -659,7 +700,7 @@ else cd $GMPDIR && ./configure && cd .. fi - #MY_SUBDIRS="$MY_SUBDIRS $GMPDIR" + #MY_SUBDIRS="$MY_SUBDIRS $GMPDIR" echo "#" echo "#" @@ -676,7 +717,7 @@ fi -AC_MSG_CHECKING("for leading underscore in object symbols") +AC_MSG_CHECKING([for leading underscore in object symbols]) cat>foo.c < #include @@ -686,60 +727,62 @@ if nm foo.o |grep " U " | grep "_cos" >/dev/null || nm foo.o |grep " U " | grep " _getc" >/dev/null ; then LEADING_UNDERSCORE=1 AC_DEFINE(LEADING_UNDERSCORE) - AC_MSG_RESULT("yes") + AC_MSG_RESULT([yes]) else LEADING_UNDERSCORE="" - AC_MSG_RESULT("no") + AC_MSG_RESULT([no]) fi -AC_MSG_CHECKING("for GNU ld option -Map") +AC_MSG_CHECKING([for GNU ld option -Map]) touch map $CC -o foo [ -Wl,-Map ] map foo.o >/dev/null 2>&1 if test `cat map | wc -l` != "0" ; then - AC_MSG_RESULT("yes") + AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_GNU_LD) GNU_LD=1 else - AC_MSG_RESULT("no") + AC_MSG_RESULT([no]) GNU_LD= fi rm -f foo.c foo.o foo map - AC_MSG_CHECKING("for size of gmp limbs") - AC_TRY_RUN([#include +AC_MSG_CHECKING([for size of gmp limbs]) +AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + #include #include "$MP_INCLUDE" - int main() { + ]],[[ FILE *fp=fopen("conftest1","w"); fprintf(fp,"%u",sizeof(mp_limb_t)); fclose(fp); - return 0; - }],mpsize=`cat conftest1`,mpsize=0,mpsize=0) + return 0;]])], + mpsize=`cat conftest1`,mpsize=0,mpsize=0) if test "$mpsize" = "0" ; then - echo "Cannot determine mpsize" - exit 1 + AC_MSG_ERROR("Cannot determine mpsize", 1) fi AC_DEFINE_UNQUOTED(MP_LIMB_BYTES,$mpsize) - AC_MSG_RESULT($mpsize) + AC_MSG_RESULT($mpsize) - AC_MSG_CHECKING("_SHORT_LIMB") - AC_TRY_RUN([#include + AC_MSG_CHECKING([_SHORT_LIMB]) + AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + #include #include "$MP_INCLUDE" - int main() { + ]],[[ #ifdef _SHORT_LIMB return 0; #else return 1; - #endif - }],AC_DEFINE(__SHORT_LIMB) AC_MSG_RESULT(yes),AC_MSG_RESULT(no),AC_MSG_RESULT(no)) - AC_MSG_CHECKING("_LONG_LONG_LIMB") - AC_TRY_RUN([#include + #endif]])], + AC_DEFINE(__SHORT_LIMB) AC_MSG_RESULT(yes),AC_MSG_RESULT(no),AC_MSG_RESULT(no)) + AC_MSG_CHECKING([_LONG_LONG_LIMB]) + AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + #include #include "$MP_INCLUDE" - int main() { + ]],[[ #ifdef _LONG_LONG_LIMB return 0; #else return 1; - #endif - }],AC_DEFINE(__LONG_LONG_LIMB) AC_MSG_RESULT(yes),AC_MSG_RESULT(no),AC_MSG_RESULT(no)) + #endif]])], + AC_DEFINE(__LONG_LONG_LIMB) AC_MSG_RESULT(yes),AC_MSG_RESULT(no),AC_MSG_RESULT(no)) GMP=1 AC_DEFINE(GMP) @@ -754,15 +797,15 @@ # # X windows -# +# -if test "$enable_xgcl" = "yes" ; then +if test "$enable_xgcl" = "yes" ; then AC_PATH_XTRA - echo $X_CFLAGS - echo $X_LIBS - echo $X_EXTRA_LIBS - echo $X_PRE_LIBS + echo X_CFLAGS = $X_CFLAGS + echo X_LIBS = $X_LIBS + echo X_EXTRA_LIBS = $X_EXTRA_LIBS + echo X_PRE_LIBS = $X_PRE_LIBS miss=0 AC_CHECK_LIB(Xmu,main,X_LIBS="$X_LIBS -lXmu",miss=1,$X_LIBS) @@ -770,7 +813,7 @@ AC_CHECK_LIB(Xext,main,X_LIBS="$X_LIBS -lXext",miss=1,$X_LIBS) AC_CHECK_LIB(Xaw,main,X_LIBS="$X_LIBS -lXaw",miss=1,$X_LIBS) AC_CHECK_LIB(X11,main,X_LIBS="$X_LIBS -lX11",miss=1,$X_LIBS) - + if test "$miss" = "1" ; then X_CFLAGS= X_LIBS= @@ -792,11 +835,10 @@ if test "$enable_dlopen" = "yes" ; then - AC_CHECK_LIB(dl,dlopen,have_dl=1,have_dl=0) - if test "$have_dl" = "0" ; then - echo "Cannot find dlopen in -dl" - exit 1 - fi + AC_CHECK_LIB(dl,dlopen,have_dl=1,have_dl=0) + if test "$have_dl" = "0" ; then + AC_MSG_ERROR("Cannot find dlopen in -dl", 1) + fi dnl AC_SEARCH_LIBS(dlopen, dl, have_dl=1, AC_ERROR(dlopen not found)) dnl LIBS and TLIBS - why not merged from the beginning? @@ -812,19 +854,22 @@ # Old binutils appear to need CONST defined to const # AC_MSG_CHECKING(if need to define CONST for bfd) - AC_TRY_RUN([#define IN_GCC - #include - int main() { symbol_info t; return 0;}], + AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + #define IN_GCC + #include + ]],[[symbol_info t; return 0;]])], AC_MSG_RESULT(no), - AC_TRY_RUN([#define CONST const - #define IN_GCC - #include - int main() {symbol_info t; return 0;}], - AC_MSG_RESULT(yes) + AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + #define CONST const + #define IN_GCC + #include + ]],[[ + symbol_info t; return 0;]])], + AC_MSG_RESULT(yes) AC_DEFINE(NEED_CONST), - AC_MSG_RESULT(cannot use bfd) exit 1;, - AC_MSG_RESULT(cannot use bfd) exit 1;), - AC_MSG_RESULT(cannot use bfd) exit 1;) + AC_MSG_ERROR(cannot use bfd, 1), + AC_MSG_ERROR(cannot use bfd, 1)), + AC_MSG_ERROR(cannot use bfd, 1)) ,,-liberty)) AC_DEFINE(HAVE_LIBBFD) @@ -833,12 +878,13 @@ # BFD boolean syntax # - AC_MSG_CHECKING(for useable bfd_boolean) - AC_TRY_RUN([#define IN_GCC - #include - bfd_boolean foo() {return FALSE;} - int main() {return 0;}], - AC_MSG_RESULT(yes) + AC_MSG_CHECKING(for usable bfd_boolean) + AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + #define IN_GCC + #include + bfd_boolean foo() {return FALSE;}]], + [[return 0;]])], + AC_MSG_RESULT(yes) AC_DEFINE(HAVE_BFD_BOOLEAN), AC_MSG_RESULT(no), AC_MSG_RESULT(no)) @@ -865,13 +911,13 @@ else echo Guessing path to libbfd.a due to gcc bug LIBBFD="/usr/lib/libbfd.a" - fi + fi if echo $MP | tr ' ' '\012' | grep -q libiberty.a ; then LIBIBERTY="`echo $MP | tr ' ' '\012' | grep libiberty.a | $AWK '{i=split($1,A,"/");for (j=1;j<=i;j++) if (j>1 && A[[j]]=="..") {j--;i-=2;for (k=j;k<=i;k++) A[[k]]=A[[k+2]];j--;}} END {for (j=1;j<=i;j++) printf("%s%s",A[[j]],j!=i ? "/" : "")}'`" else echo Guessing path to libiberty.a due to gcc bug LIBIBERTY="/usr/lib/libiberty.a" - fi + fi BUILD_BFD=copy_bfd AC_SUBST(BUILD_BFD) AC_SUBST(LIBBFD) @@ -889,7 +935,7 @@ # AC_CHECK_HEADER(libintl.h, true, # AC_MSG_ERROR(libintl.h (gettext) not found)) # AC_SEARCH_LIBS(dgettext, intl, true, AC_MSG_ERROR(gettext library not found)) - + echo "#" echo "#" echo "# -------------------------" @@ -897,7 +943,7 @@ echo "#" echo "#" cd binutils/intl && chmod +x configure && ./configure --disable-nls && cd ../.. -# MY_SUBDIRS="$MY_SUBDIRS binutils/libiberty " +# MY_SUBDIRS="$MY_SUBDIRS binutils/libiberty " echo "#" echo "#" echo "#" @@ -911,7 +957,7 @@ echo "#" echo "#" cd binutils/libiberty && chmod +x configure && ./configure --disable-nls && cd ../.. -# MY_SUBDIRS="$MY_SUBDIRS binutils/libiberty " +# MY_SUBDIRS="$MY_SUBDIRS binutils/libiberty " echo "#" echo "#" echo "#" @@ -925,7 +971,7 @@ echo "#" echo "#" cd binutils/bfd && chmod +x configure && ./configure --with-included-gettext --disable-nls && cd ../.. -# MY_SUBDIRS="$MY_SUBDIRS binutils/bfd " +# MY_SUBDIRS="$MY_SUBDIRS binutils/bfd " echo "#" echo "#" echo "#" @@ -944,58 +990,48 @@ # mechanism, in the PAGE macro. This offset is subtracted from # addresses, in calculating a page for an address in the heap. -AC_CHECK_SIZEOF(long,0) +AC_CHECK_SIZEOF(long) AC_MSG_CHECKING(sizeof struct contblock) # work around MSYS pwd result incompatibility if test "$use" = "mingw" ; then -AC_TRY_RUN([#include +AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + #include #define EXTER #include "$MP_INCLUDE" #include "h/enum.h" #include "h/object.h" - int main(int argc,char **argv,char **envp) { + ]].[[ FILE *f=fopen("conftest1","w"); fprintf(f,"%u",sizeof(struct contblock)); fclose(f); - return 0; - }],sizeof_contblock=`cat conftest1`, - echo Cannot find sizeof struct contblock;exit 1, - echo Cannot find sizeof struct contblock;exit 1) + return 0;]])], + sizeof_contblock=`cat conftest1`, + AC_MSG_ERROR(Cannot find sizeof struct contblock, 1), + AC_MSG_ERROR(Cannot find sizeof struct contblock, 1)) else -AC_TRY_RUN([#include +AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + #include #define EXTER #include "$MP_INCLUDE" #include "`pwd`/h/enum.h" #include "`pwd`/h/object.h" - int main(int argc,char **argv,char **envp) { + ]],[[ FILE *f=fopen("conftest1","w"); fprintf(f,"%u",sizeof(struct contblock)); fclose(f); - return 0; - }],sizeof_contblock=`cat conftest1`, - echo Cannot find sizeof struct contblock;exit 1, - echo Cannot find sizeof struct contblock;exit 1) + return 0;]])], + sizeof_contblock=`cat conftest1`, + AC_MSG_ERROR(Cannot find sizeof struct contblock, 1), + AC_MSG_ERROR(Cannot find sizeof struct contblock, 1)) fi AC_MSG_RESULT($sizeof_contblock) AC_DEFINE_UNQUOTED(SIZEOF_CONTBLOCK,$sizeof_contblock) -AC_MSG_CHECKING(for word order) -AC_TRY_RUN([int main () { - /* Are we little or big endian? Adapted from Harbison&Steele. */ - union - { - double d; - int l[sizeof(double)/sizeof(int)]; - } u; - u.d = 1.0; - return u.l[sizeof(double)/sizeof(int)-1] ? 0 : 1; -}],AC_MSG_RESULT(little) - AC_DEFINE(LITTLE_END), - AC_MSG_RESULT(big), - AC_MSG_RESULT([WARNING: ASSUMING LITTLE ENDIAN FOR CROSS COMPILING !!!] - AC_DEFINE(LITTLE_END))) +AC_C_BIGENDIAN([], [AC_DEFINE(LITTLE_END)], + [AC_MSG_RESULT([WARNING: ASSUMING LITTLE ENDIAN FOR CROSS COMPILING !!!]) + AC_DEFINE(LITTLE_END)]) AC_SUBST(LITTLE_END) @@ -1004,15 +1040,16 @@ AC_MSG_CHECKING([for sbrk]) HAVE_SBRK="" -AC_TRY_RUN([#include - #include - int main() { +AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + #include + #include + ]],[[ FILE *f; if (!(f=fopen("conftest1","w"))) return -1; fprintf(f,"%lu",sbrk(0)); return 0; - }], + ]])], HAVE_SBRK=1 AC_MSG_RESULT(yes), AC_MSG_RESULT([no: WARNING you must be able to emulate sbrk: as on mingw or macosx]), @@ -1024,14 +1061,14 @@ # AC_MSG_RESULT(sys/personality.h not found)) AC_MSG_CHECKING([for ADDR_NO_RANDOMIZE constant]) - AC_TRY_RUN([#include - #include - int main(int argc,char *argv[],char *envp[]) { + AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + #include + #include + ]],[[ FILE *f; if (!(f=fopen("conftest1","w"))) return -1; fprintf(f,"%x",ADDR_NO_RANDOMIZE); - return 0; - }], + return 0;]])], ADDR_NO_RANDOMIZE=`cat conftest1`,ADDR_NO_RANDOMIZE=0,ADDR_NO_RANDOMIZE=0) if test "$ADDR_NO_RANDOMIZE" = "0" ; then AC_MSG_RESULT([no, assuming 0x40000]) @@ -1100,14 +1137,17 @@ # pagewidth AC_MSG_CHECKING(for pagewidth) -AC_TRY_RUN([#include - #include -int main() {size_t i=getpagesize(),j; - FILE *fp=fopen("conftest1","w"); - for (j=0;i>>=1;j++); - if (j<12) {printf("pagewidth %u is too small\n",j);return -1;} - fprintf(fp,"%u",j); - return 0;}],PAGEWIDTH=`cat conftest1`,PAGEWIDTH=0,PAGEWIDTH=0) +AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + #include + #include + ]],[[ + size_t i=getpagesize(),j; + FILE *fp=fopen("conftest1","w"); + for (j=0;i>>=1;j++); + if (j<12) {printf("pagewidth %u is too small\n",j);return -1;} + fprintf(fp,"%u",j); + return 0;]])], + PAGEWIDTH=`cat conftest1`,PAGEWIDTH=0,PAGEWIDTH=0) AC_MSG_RESULT($PAGEWIDTH) AC_DEFINE_UNQUOTED(PAGEWIDTH,$PAGEWIDTH) AC_SUBST(PAGEWIDTH) @@ -1115,7 +1155,7 @@ old_LDFLAGS="$LDFLAGS" LDFLAGS="$TLDFLAGS" -AC_MSG_CHECKING("finding DBEGIN") +AC_MSG_CHECKING([for DBEGIN]) AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include #include @@ -1152,30 +1192,29 @@ LDFLAGS="$old_LDFLAGS" -AC_MSG_CHECKING("finding CSTACK_ADDRESS") -AC_TRY_RUN([#include -main() -{ - char *b ; - FILE *fp = fopen("conftest1","w"); - fprintf(fp,"%ld",((long) &b)); - fclose(fp); - return 0; -}],cstack_address=`cat conftest1`,cstack_address=0,cstack_address=0) +AC_MSG_CHECKING([for CSTACK_ADDRESS]) +AC_RUN_IFELSE([AC_LANG_PROGRAM([[ +#include +]],[[ +char *b ; +FILE *fp = fopen("conftest1","w"); +fprintf(fp,"%ld",((long) &b)); +fclose(fp); +return 0;]])], +cstack_address=`cat conftest1`,cstack_address=0,cstack_address=0) AC_DEFINE_UNQUOTED(CSTACK_ADDRESS,$cstack_address \ ) AC_MSG_RESULT(got $cstack_address) -AC_MSG_CHECKING("sizeof long long int") -AC_TRY_RUN([#include -main() -{ - if (sizeof(long long int) == 2*sizeof(long)) return 0; - return 1; -} -],[AC_DEFINE(HAVE_LONG_LONG) +AC_MSG_CHECKING([sizeof long long int]) +AC_RUN_IFELSE([AC_LANG_PROGRAM([[ +#include +]],[[ +if (sizeof(long long int) == 2*sizeof(long)) return 0; +return 1;]])], +[AC_DEFINE(HAVE_LONG_LONG) AC_MSG_RESULT(yes)], AC_MSG_RESULT(no), AC_MSG_RESULT(no) @@ -1185,12 +1224,15 @@ # readline AC_ARG_ENABLE(readline, - [--enable-readine enables command line completion via the readline library ],, + [AS_HELP_STRING([--enable-readline], + [enables command line completion via the readline library])],, enable_readline="yes") # ansi lisp -AC_ARG_ENABLE(ansi,[--enable-ansi builds a large gcl aiming for ansi compliance, - --disable-ansi builds the smaller traditional CLtL1 image],,enable_ansi="no") +AC_ARG_ENABLE(ansi, + [AS_HELP_STRING([--enable-ansi], + [builds a large gcl aiming for ansi compliance; the default is to build the smaller traditional CLtL1 image])] + ,,enable_ansi="no") if test "$enable_ansi" = "yes" ; then SYSTEM=ansi_gcl @@ -1247,7 +1289,7 @@ [sys/time.h], [AC_MSG_RESULT([present])], [AC_MSG_RESULT([missing]) - AC_DEFINE(GETTOD_NOT_DECLARED)]) + AC_DEFINE(GETTOD_NOT_DECLARED)]) AC_CHECK_LIB(m,sin,LIBS="${LIBS} -lm",true) @@ -1257,21 +1299,21 @@ if test "$try_japi" = "yes" ; then AC_CHECK_HEADERS(japi.h,[AC_DEFINE(HAVE_JAPI_H) EXTRA_LOBJS="${EXTRA_LOBJS} gcl_japi.o" - LIBS="${LIBS} -ljapi -lwsock32"] ) + LIBS="${LIBS} -ljapi -lwsock32"] ) fi if test "$use" = "mingw" ; then if test "$try_xdr" = "yes" ; then AC_CHECK_HEADERS(rpc/rpc.h,[AC_DEFINE(HAVE_XDR) - LIBS="${LIBS} -loncrpc"] ) + LIBS="${LIBS} -loncrpc"] ) fi else if test "$try_xdr" = "yes" ; then AC_CHECK_HEADERS(rpc/rpc.h,[AC_DEFINE(HAVE_XDR) - LIBS="${LIBS} -lrpc"] ) + LIBS="${LIBS} -lrpc"] ) fi fi -# Should really find a way to check for prototypes, but this +# Should really find a way to check for prototypes, but this # basically works for now. CM # AC_CHECK_HEADERS(math.h,AC_DEFINE(HAVE_MATH_H)) @@ -1292,41 +1334,58 @@ # test makes sense. CM # AC_MSG_CHECKING([for isnormal]) -AC_TRY_RUN([#define _GNU_SOURCE - #include - int main() { +AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + #include + ]],[[ float f; - return isnormal(f) || !isnormal(f) ? 0 : 1; - }], - AC_DEFINE(HAVE_ISNORMAL) AC_MSG_RESULT(yes), + return isnormal(f) || !isnormal(f) ? 0 : 1;]])], + [AC_DEFINE(HAVE_ISNORMAL) + AC_MSG_RESULT(yes)], AC_MSG_CHECKING([for fpclass in ieeefp.h]) - AC_TRY_RUN([#include - int main() { + AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + #include + ]],[[ float f; return fpclass(f)>=FP_NZERO || fpclass(f) - int main() { +AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + #include + ]],[[ float f; return isfinite(f) || !isfinite(f) ? 0 : 1; - }], - AC_DEFINE(HAVE_ISFINITE) AC_MSG_RESULT(yes), + ]])], + [AC_DEFINE(HAVE_ISFINITE) + AC_MSG_RESULT(yes)], AC_MSG_CHECKING([for finite()]) - AC_TRY_RUN([#include - #include - int main() { + AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + #include + #include + ]],[[ float f; return finite(f) || !finite(f) ? 0 : 1; - }], - AC_DEFINE(HAVE_FINITE) AC_MSG_RESULT(yes), - HAVE_FINITE=0 AC_MSG_RESULT(no),HAVE_FINITE=0 AC_MSG_RESULT(no)) - ,HAVE_ISFINITE=0 AC_MSG_RESULT(no),HAVE_ISFINITE=0 AC_MSG_RESULT(no)) + ]])], + [AC_DEFINE(HAVE_FINITE) + AC_MSG_RESULT(yes)], + [HAVE_FINITE=0 + AC_MSG_RESULT(no)], + [HAVE_FINITE=0 + AC_MSG_RESULT(no)]) + ,[HAVE_ISFINITE=0 + AC_MSG_RESULT(no)], + [HAVE_ISFINITE=0 + AC_MSG_RESULT(no)]) @@ -1347,7 +1406,6 @@ # To get around this problem, check for both libraries together # if -lsocket doesn't work by itself. #-------------------------------------------------------------------- -AC_MSG_CHECKING([for sockets]) tcl_checkBoth=0 AC_CHECK_FUNC(connect, tcl_checkSocket=0, tcl_checkSocket=1) if test "$tcl_checkSocket" = 1; then @@ -1367,7 +1425,7 @@ if test "$enable_readline" = "yes" ; then AC_CHECK_HEADERS(readline/readline.h, AC_CHECK_LIB(readline,main, - AC_DEFINE(HAVE_READLINE) + AC_DEFINE(HAVE_READLINE) TLIBS="$TLIBS -lreadline -lncurses" RL_OBJS=gcl_readline.o # Readline support now initialized automatically when compiled in, this lisp @@ -1384,8 +1442,8 @@ AC_SUBST(RL_OBJS) AC_SUBST(RL_LIB) -AC_MSG_CHECKING(For network code for nsocket.c) -AC_TRY_LINK([ +AC_MSG_CHECKING(for network code for nsocket.c) +AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include #include @@ -1394,7 +1452,7 @@ #include #include -/************* for the sockets ******************/ +/************* for the sockets ******************/ #include /* struct sockaddr, SOCK_STREAM, ... */ #ifndef NO_UNAME # include /* uname system call. */ @@ -1402,24 +1460,25 @@ #include /* struct in_addr, struct sockaddr_in */ #include /* inet_ntoa() */ #include /* gethostbyname() */ -],[ connect(0,(struct sockaddr *)0,0); - gethostbyname("jil"); - socket(AF_INET, SOCK_STREAM, 0); - ], +]],[[connect(0,(struct sockaddr *)0,0); + gethostbyname("jil"); + socket(AF_INET, SOCK_STREAM, 0); + ]])], [AC_DEFINE(HAVE_NSOCKET) AC_MSG_RESULT(yes)], AC_MSG_RESULT(no)) -AC_MSG_CHECKING(check for listen using fcntl) -AC_TRY_COMPILE([#include +AC_MSG_CHECKING(for listen using fcntl) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include #include -], -[FILE *fp=fopen("configure.in","r"); +]], +[[FILE *fp=fopen("configure.in","r"); int orig; orig = fcntl(fileno(fp), F_GETFL); if (! (orig & O_NONBLOCK )) return 0; -], +]])], [AC_DEFINE(LISTEN_USE_FCNTL) AC_MSG_RESULT(yes)], AC_MSG_RESULT(no)) @@ -1440,7 +1499,7 @@ AC_SUBST(USE_CLEANUP) gcl_ok=no -AC_HEADER_EGREP(LITTLE_ENDIAN, ctype.h, gcl_ok=yes, gcl_ok=noo) +AC_EGREP_HEADER(LITTLE_ENDIAN, ctype.h, gcl_ok=yes, gcl_ok=no) if test $gcl_ok = yes ; then AC_DEFINE(ENDIAN_ALREADY_DEFINED) fi @@ -1472,32 +1531,35 @@ esac -AC_MSG_CHECKING(check for SV_ONSTACK) -AC_TRY_COMPILE([#include +AC_MSG_CHECKING(for SV_ONSTACK) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include int joe=SV_ONSTACK; -], -[], +]], +[])], [AC_DEFINE(HAVE_SV_ONSTACK) AC_SUBST(HAVE_SV_ONSTACK) AC_MSG_RESULT(yes)], AC_MSG_RESULT(no)) -AC_MSG_CHECKING(check for SIGSYS) -AC_TRY_COMPILE([#include +AC_MSG_CHECKING(for SIGSYS) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include int joe=SIGSYS; -], -[], +]], +[])], [AC_DEFINE(HAVE_SIGSYS) AC_SUBST(HAVE_SIGSYS) AC_MSG_RESULT(yes)], AC_MSG_RESULT(no)) -AC_MSG_CHECKING(check for SIGEMT) -AC_TRY_COMPILE([#include +AC_MSG_CHECKING(for SIGEMT) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include int joe=SIGEMT; -], -[], +]], +[])], [AC_DEFINE(HAVE_SIGEMT) AC_SUBST(HAVE_SIGEMT) AC_MSG_RESULT(yes)], @@ -1508,35 +1570,37 @@ #if test $use = "386-linux" ; then AC_CHECK_HEADERS(asm/sigcontext.h) - AC_CHECK_HEADERS(asm/signal.h) + AC_PREPROC_IFELSE(asm/signal.h) AC_MSG_CHECKING([for sigcontext...]) - AC_TRY_COMPILE([#include - ], - [ - struct sigcontext foo; - ], + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + ]], + [[ + struct sigcontext foo; + ]])], [ sigcontext_works=1; AC_DEFINE(SIGNAL_H_HAS_SIGCONTEXT) AC_MSG_RESULT(sigcontext in signal.h) ], - + [sigcontext_works=0; AC_MSG_RESULT(sigcontext NOT in signal.h)] ) if test "$sigcontext_works" = 0 ; then AC_MSG_CHECKING([for sigcontext...]) - AC_TRY_COMPILE([#include - #ifdef HAVE_ASM_SIGCONTEXT_H + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #ifdef HAVE_ASM_SIGCONTEXT_H #include #endif - #ifdef HAVE_ASM_SIGNAL_H + #ifdef HAVE_ASM_SIGNAL_H #include #endif - ], - [ + ]], + [[ struct sigcontext foo; - ], + ]])], [ AC_DEFINE(HAVE_SIGCONTEXT) AC_MSG_RESULT(sigcontext in asm files) @@ -1549,7 +1613,7 @@ fi # echo 'foo() {}' > conftest1.c # $CC -S conftest1.c -# use_underscore=0 +# use_underscore=0 # if fgrep _foo conftest1.s ; then use_underscore=1 ; fi # if test $use_underscore = 0 ; then # MPI_FILE=mpi-386_no_under.o @@ -1626,7 +1690,7 @@ (let ((ans "") file (tem Info-default-directory-list)) (while tem (cond ((file-exists-p (setq file (expand-file-name "dir" (car tem)))) - (setq ans (file-name-as-directory (car tem))) + (setq ans (file-name-as-directory (car tem))) (setq tem nil) )) (setq tem (cdr tem))) (message ans)) @@ -1644,6 +1708,7 @@ AC_MSG_RESULT($INFO_DIR) AC_SUBST(INFO_DIR) +AC_CHECK_LIB(lieee,main,have_ieee=1,have_ieee=0) AC_MSG_CHECKING([for tcl/tk]) @@ -1654,7 +1719,7 @@ set dir [set tcl_library] if { [file exists [file join [set dir] tclConfig.sh]] } { puts [set dir] - exit + exit } set dir [file dirname [set tcl_library]] if { [file exists [file join [set dir] tclConfig.sh]] } { @@ -1728,7 +1793,7 @@ else if test -f /usr/include/tcl${TCL_VERSION}/tk.h ; then TK_INCLUDE=-I/usr/include/tcl${TCL_VERSION} - fi + fi fi if test -f ${TCL_CONFIG_PREFIX}/../include/tcl.h ; then TCL_INCLUDE=-I${TCL_CONFIG_PREFIX}/../include @@ -1737,7 +1802,6 @@ TCL_INCLUDE=-I/usr/include/tcl${TCL_VERSION} fi fi -AC_CHECK_LIB(lieee,main,have_ieee=1,have_ieee=0) if test "$have_ieee" = "0" ; then TCL_LIBS=`echo ${TCL_LIBS} | sed -e "s:-lieee::g" ` fi @@ -1774,46 +1838,21 @@ NOTIFY=$enable_notify AC_SUBST(NOTIFY) - + # for sgbc the mprotect capabilities. # the time handling for unixtime, add timezone -AC_MSG_CHECKING([alloca]) -AC_TRY_RUN([int main() { exit(alloca(500) != NULL ? 0 : 1);}], - ,gcl_ok=yes, gcl_ok=no,gcl_ok=no) -if test $gcl_ok = yes ; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_ALLOCA) -else - AC_TRY_RUN([#include - int main() { exit(alloca(500) != NULL ? 0 : 1);}], - ,gcl_ok=yes, gcl_ok=no,gcl_ok=no) - if test $gcl_ok = yes ; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_ALLOCA) - AC_DEFINE(NEED_ALLOCA_H) - fi -fi -if test $gcl_ok = no ; then AC_MSG_RESULT(no) ; fi - - - - - - - - - - # alloca +AC_FUNC_ALLOCA + # dlopen etc # idea make it so you do something dlopen(libX.so,RTLD_GLOBAL) # then dlload("foo.o") a lisp file can refer to things in libX.so -# +# # what machine this is, and include then a machine specific hdr. # and machine specific defs. @@ -1834,8 +1873,8 @@ # redhat/cygnus released for some reason a buggy version of gcc, # which no one else released. Catch that here. AC_MSG_CHECKING([Checking for buggy gcc version from redhat]) -if 2>&1 $CC -v | fgrep "gcc version 2.96" > /dev/null - then +if 2>&1 $CC -v | fgrep "gcc version 2.96" > /dev/null + then BROKEN_O4_OPT=1 AC_DEFINE(BROKEN_O4_OPT) AC_SUBST(BROKEN_O4_OPT) @@ -1844,7 +1883,7 @@ AC_MSG_RESULT([yes .. turning off -O4]) else AC_MSG_RESULT([no]) -fi +fi LIBS="$LDFLAGS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS $TLDFLAGS $LIBS $TLIBS" AC_SUBST(LIBS) @@ -1866,7 +1905,8 @@ if test -f h/$use.defs ; then AC_SUBST(use) - AC_OUTPUT(makedefc windows/gcl.iss windows/sysdir.bat windows/install.lsp ) + AC_CONFIG_FILES(makedefc windows/gcl.iss windows/sysdir.bat windows/install.lsp) + AC_OUTPUT echo makedefc cat makedefc