From 65251c5d82671e264cbb37c0e0d995a8ff10b61a Mon Sep 17 00:00:00 2001 From: Richard Kreckel Date: Fri, 19 May 2000 12:58:39 +0000 Subject: [PATCH] - INSTALL.generic: Clarified behaviour of --with-gmp. - configure, configure.in: Safer GMP3-detection. - ChangeLog: Updated. --- ChangeLog | 31 ++++++- INSTALL.generic | 6 +- configure | 241 ++++++++++++++++++++++++------------------------ configure.in | 3 +- 4 files changed, 158 insertions(+), 123 deletions(-) diff --git a/ChangeLog b/ChangeLog index fcd2578..80b52b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +2000-05-19 Richard Kreckel + + * src/base/digitseq/cl_DS_mul.cc: Rearranged break-even points to + better match present-day CPUs whenever GMP3 is used. + * src/base/digitseq/cl_DS_div.cc: dto. + * src/TUNING: Added comment about order of tuning. + * configure, configure.in: Safer GMP3-detection. + * INSTALL.generic: Clarified behaviour of --with-gmp. + * autoconf/config.guess: updated from Clisp-2000-03-06 sources. + +2000-05-05 Richard Kreckel + + * doc/cln.tex: Added index entries. + * doc/texinfo.tex: Upgraded to newer version 1999-10-01.07. + * doc/*: Changes triggered. + +2000-05-04 Richard Kreckel + + * gmp/: removed completely. From now on we are going to link + externally against libgmp3.0 or above! + * configure, configure.in, Makefile.in, */Makeflags: removed support + of internal gmp 2.0.2, like $GMP_INCLUDES, which should be done by + setting $CPPFLAGS instead. + * Makefile.in: Added libtool inter-library dependency for -lgmp and + conforming interface versioning (-version-info). + * autoconf/ltconfig, autoconf/ltmain.sh: Updated to newer versions + from libtool 1.3.4. + 2000-02-22 Bruno Haible * src/base/digitseq/cl_asm_mips_.cc: Starting at argument 5 the @@ -10,7 +38,8 @@ aren't and there were problems on some architectures, PowerPC in particular. See the file gmp/README.CLN. This way the hard links in this directory have vanished, they were causing - trouble for people working in AFS. + trouble for people working in AFS. This became necessary for + Debian, because there it woudn't compile on PPC. 2000-01-13 Richard Kreckel diff --git a/INSTALL.generic b/INSTALL.generic index f8d09bd..994c9e2 100644 --- a/INSTALL.generic +++ b/INSTALL.generic @@ -154,8 +154,10 @@ operates. `--with-gmp' `--without-gmp' - CLN builds upon GNU gmp by default. If you encounter problems - relating to gmp, try configuring without gmp. + CLN may be build upon GNU gmp (version 3 or above), recommended for + maximum performance. CLN will not work together with GNU gmp 2. + The default is to use gmp. If you encounter problems relating to gmp, + try configuring without gmp. `configure' also accepts some other, not widely useful, options. diff --git a/configure b/configure index 479912a..1e574f3 100755 --- a/configure +++ b/configure @@ -22,7 +22,8 @@ ac_help="$ac_help ac_help="$ac_help --with-gnu-ld assume the C compiler uses GNU ld [default=no]" ac_help="$ac_help - --with-gmp use external fast GNU gmp low-level functions" + --with-gmp use external fast low-level functions from GNU gmp3. + [default=yes]" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -537,7 +538,7 @@ fi echo $ac_n "checking whether ${MAKE-make} sets \$(MAKE)""... $ac_c" 1>&6 -echo "configure:541: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo "configure:542: checking whether ${MAKE-make} sets \$(MAKE)" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -587,7 +588,7 @@ d # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:591: checking for $ac_word" >&5 +echo "configure:592: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -617,7 +618,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:621: checking for $ac_word" >&5 +echo "configure:622: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -668,7 +669,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:672: checking for $ac_word" >&5 +echo "configure:673: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -700,7 +701,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:704: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:705: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -711,12 +712,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 715 "configure" +#line 716 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -742,12 +743,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:746: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:747: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:751: checking whether we are using GNU C" >&5 +echo "configure:752: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -756,7 +757,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -791,7 +792,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:795: checking how to run the C preprocessor" >&5 +echo "configure:796: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -811,13 +812,13 @@ else # not just through cpp. On NeXTstep 3.1 the same holds for /lib/cpp; use # "cc -E -traditional-cpp" instead. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:821: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -831,13 +832,13 @@ rm -f conftest* if test -z "$ac_have_cpp"; then CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -853,13 +854,13 @@ rm -f conftest* else CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -891,7 +892,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:895: checking for $ac_word" >&5 +echo "configure:896: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -923,7 +924,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:927: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:928: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -934,12 +935,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 938 "configure" +#line 939 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -965,12 +966,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:969: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:970: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:974: checking whether we are using GNU C++" >&5 +echo "configure:975: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -979,7 +980,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:983: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1014,7 +1015,7 @@ else fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1018: checking how to run the C++ preprocessor" >&5 +echo "configure:1019: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1027,12 +1028,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1036: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1058,7 +1059,7 @@ echo "$ac_t""$CXXCPP" 1>&6 echo $ac_n "checking for underscore in external names""... $ac_c" 1>&6 -echo "configure:1062: checking for underscore in external names" >&5 +echo "configure:1063: checking for underscore in external names" >&5 if eval "test \"`echo '$''{'cl_cv_prog_as_underscore'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1067,7 +1068,7 @@ cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } >/dev/null 2>&1 +{ ac_try='${CC-cc} -S conftest.c'; { (eval echo configure:1072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } >/dev/null 2>&1 if grep _foo conftest.s >/dev/null ; then cl_cv_prog_as_underscore=yes else @@ -1090,7 +1091,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1094: checking for $ac_word" >&5 +echo "configure:1095: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1128,7 +1129,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1132: checking for a BSD compatible install" >&5 +echo "configure:1133: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'cl_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1182,7 +1183,7 @@ fi ac_aux_dir=${srcdir}/autoconf echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1186: checking host system type" >&5 +echo "configure:1187: checking host system type" >&5 if eval "test \"`echo '$''{'cl_cv_host'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1235,13 +1236,13 @@ case "$host_cpu" in ;; mips ) echo $ac_n "checking for 64-bit MIPS""... $ac_c" 1>&6 -echo "configure:1239: checking for 64-bit MIPS" >&5 +echo "configure:1240: checking for 64-bit MIPS" >&5 if eval "test \"`echo '$''{'cl_cv_host_mips64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:1274: checking for 64-bit SPARC" >&5 +echo "configure:1275: checking for 64-bit SPARC" >&5 if eval "test \"`echo '$''{'cl_cv_host_sparc64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:1373: checking for ld used by GCC" >&5 +echo "configure:1374: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -1387,10 +1388,10 @@ echo "configure:1373: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1391: checking for GNU ld" >&5 +echo "configure:1392: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1394: checking for non-GNU ld" >&5 +echo "configure:1395: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1426,7 +1427,7 @@ fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1430: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1431: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1441,7 +1442,7 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1445: checking for BSD-compatible nm" >&5 +echo "configure:1446: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1478,7 +1479,7 @@ echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1482: checking whether ln -s works" >&5 +echo "configure:1483: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1514,8 +1515,8 @@ test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" case "$host" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1518 "configure"' > conftest.$ac_ext - if { (eval echo configure:1519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1519 "configure"' > conftest.$ac_ext + if { (eval echo configure:1520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -1566,20 +1567,20 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for bool type""... $ac_c" 1>&6 -echo "configure:1570: checking for bool type" >&5 +echo "configure:1571: checking for bool type" >&5 if eval "test \"`echo '$''{'cl_cv_cplusplus_bool'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cl_cv_cplusplus_bool=yes else @@ -1613,7 +1614,7 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for long long type""... $ac_c" 1>&6 -echo "configure:1617: checking for long long type" >&5 +echo "configure:1618: checking for long long type" >&5 if eval "test \"`echo '$''{'cl_cv_c_longlong'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1622,7 +1623,7 @@ if test "$cross_compiling" = yes; then cl_cv_c_longlong="guessing no" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cl_cv_c_longlong=yes else @@ -1679,7 +1680,7 @@ EOF esac echo $ac_n "checking for long double type""... $ac_c" 1>&6 -echo "configure:1683: checking for long double type" >&5 +echo "configure:1684: checking for long double type" >&5 if eval "test \"`echo '$''{'cl_cv_c_longdouble'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1688,7 +1689,7 @@ if test "$cross_compiling" = yes; then cl_cv_c_longdouble="guessing no" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cl_cv_c_longdouble=yes else @@ -1729,20 +1730,20 @@ EOF esac echo $ac_n "checking for working template<>""... $ac_c" 1>&6 -echo "configure:1733: checking for working template<>" >&5 +echo "configure:1734: checking for working template<>" >&5 if eval "test \"`echo '$''{'cl_cv_c_templatenull'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < class c {}; template <> class c { int x; }; int main() { ; return 0; } EOF -if { (eval echo configure:1746: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cl_cv_c_templatenull=yes else @@ -1766,7 +1767,7 @@ fi if test -n "$GCC"; then echo $ac_n "checking for the global constructors function prefix""... $ac_c" 1>&6 -echo "configure:1770: checking for the global constructors function prefix" >&5 +echo "configure:1771: checking for the global constructors function prefix" >&5 if eval "test \"`echo '$''{'cl_cv_cplusplus_ctorprefix'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1776,7 +1777,7 @@ struct foo { foo (); }; foo foobar; EOF # look for the assembly language name in the .s file -{ ac_try='${CXX-g++} $CXXFLAGS -S conftest.cc'; { (eval echo configure:1780: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } >/dev/null 2>&1 +{ ac_try='${CXX-g++} $CXXFLAGS -S conftest.cc'; { (eval echo configure:1781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } >/dev/null 2>&1 if grep '_GLOBAL_\$I\$foobar' conftest.s >/dev/null ; then cl_cv_cplusplus_ctorprefix='_GLOBAL_$I$' else @@ -1806,7 +1807,7 @@ EOF EOF echo $ac_n "checking whether the global constructors function need to be exported""... $ac_c" 1>&6 -echo "configure:1810: checking whether the global constructors function need to be exported" >&5 +echo "configure:1811: checking whether the global constructors function need to be exported" >&5 if eval "test \"`echo '$''{'cl_cv_cplusplus_ctorexport'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1827,7 +1828,7 @@ foo::foo () {} extern "C" void ctor (void) __asm__ (ASM_UNDERSCORE_PREFIX CL_GLOBAL_CONSTRUCTOR_PREFIX "foobar"); int main() { ctor(); return 0; } EOF -if { ac_try='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest1.cc conftest2.cc $LIBS 1>&5'; { (eval echo configure:1831: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } >/dev/null 2>&1 && test -s conftest${ac_exeext}; then +if { ac_try='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest1.cc conftest2.cc $LIBS 1>&5'; { (eval echo configure:1832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } >/dev/null 2>&1 && test -s conftest${ac_exeext}; then cl_cv_cplusplus_ctorexport=no else cl_cv_cplusplus_ctorexport=yes @@ -1849,17 +1850,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1853: checking for $ac_hdr" >&5 +echo "configure:1854: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1889,20 +1890,20 @@ done # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:1893: checking for working alloca.h" >&5 +echo "configure:1894: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'cl_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = (char *) alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cl_cv_header_alloca_h=yes else @@ -1944,20 +1945,20 @@ char *alloca (); #endif " echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1948: checking for alloca" >&5 +echo "configure:1949: checking for alloca" >&5 if eval "test \"`echo '$''{'cl_cv_func_alloca'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cl_cv_func_alloca=yes else @@ -1989,20 +1990,20 @@ EOF fi echo $ac_n "checking for fpu_control_t""... $ac_c" 1>&6 -echo "configure:1993: checking for fpu_control_t" >&5 +echo "configure:1994: checking for fpu_control_t" >&5 if eval "test \"`echo '$''{'cl_cv_type_fpu_control_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { fpu_control_t x; ; return 0; } EOF -if { (eval echo configure:2006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cl_cv_type_fpu_control_t=yes else @@ -2024,20 +2025,20 @@ EOF fi echo $ac_n "checking for __setfpucw""... $ac_c" 1>&6 -echo "configure:2028: checking for __setfpucw" >&5 +echo "configure:2029: checking for __setfpucw" >&5 if eval "test \"`echo '$''{'cl_cv_func_setfpucw'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { __setfpucw(_FPU_IEEE); ; return 0; } EOF -if { (eval echo configure:2041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cl_cv_func_setfpucw=yes else @@ -2063,12 +2064,12 @@ fi for ac_func in gettimeofday do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2067: checking for $ac_func" >&5 +echo "configure:2068: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2119,13 +2120,13 @@ fi done if test $ac_cv_func_gettimeofday = yes; then echo $ac_n "checking for gettimeofday declaration""... $ac_c" 1>&6 -echo "configure:2123: checking for gettimeofday declaration" >&5 +echo "configure:2124: checking for gettimeofday declaration" >&5 if eval "test \"`echo '$''{'cl_cv_proto_gettimeofday'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2146,7 +2147,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cl_cv_proto_gettimeofday_dots=no cl_cv_proto_gettimeofday_arg2="struct timezone *" @@ -2155,7 +2156,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -2176,7 +2177,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cl_cv_proto_gettimeofday_dots=no cl_cv_proto_gettimeofday_arg2="void *" @@ -2217,12 +2218,12 @@ fi for ac_func in ftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2221: checking for $ac_func" >&5 +echo "configure:2222: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2274,12 +2275,12 @@ done if test $ac_cv_func_gettimeofday = no -a $ac_cv_func_ftime = no; then echo $ac_n "checking for times""... $ac_c" 1>&6 -echo "configure:2278: checking for times" >&5 +echo "configure:2279: checking for times" >&5 if eval "test \"`echo '$''{'ac_cv_func_times'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_times=yes" else @@ -2326,7 +2327,7 @@ no_times=1 fi if test -z "$no_times"; then echo $ac_n "checking for times return value""... $ac_c" 1>&6 -echo "configure:2330: checking for times return value" >&5 +echo "configure:2331: checking for times return value" >&5 if eval "test \"`echo '$''{'cl_cv_func_times_return'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2335,7 +2336,7 @@ if test "$cross_compiling" = yes; then cl_cv_func_times_return="guessing no" else cat > conftest.$ac_ext <= CLK_TCK/2) && (ticks <= 3*CLK_TCK/2))); } EOF -if { (eval echo configure:2365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cl_cv_func_times_return=yes else @@ -2399,17 +2400,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2403: checking for $ac_hdr" >&5 +echo "configure:2404: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2436,13 +2437,13 @@ fi done if test $ac_cv_header_sys_resource_h = yes; then echo $ac_n "checking for getrusage""... $ac_c" 1>&6 -echo "configure:2440: checking for getrusage" >&5 +echo "configure:2441: checking for getrusage" >&5 if eval "test \"`echo '$''{'cl_cv_func_getrusage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < /* NetBSD 1.0 needs this */ #include @@ -2451,7 +2452,7 @@ int main() { struct rusage x; int y = RUSAGE_SELF; getrusage(y,&x); x.ru_utime.tv_sec; ; return 0; } EOF -if { (eval echo configure:2455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cl_cv_func_getrusage=yes else @@ -2473,13 +2474,13 @@ EOF fi if test $cl_cv_func_getrusage = yes; then echo $ac_n "checking for getrusage declaration""... $ac_c" 1>&6 -echo "configure:2477: checking for getrusage declaration" >&5 +echo "configure:2478: checking for getrusage declaration" >&5 if eval "test \"`echo '$''{'cl_cv_proto_getrusage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2505,7 +2506,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2509: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cl_cv_proto_getrusage_arg1="int" else @@ -2532,13 +2533,13 @@ EOF fi echo $ac_n "checking for perror declaration""... $ac_c" 1>&6 -echo "configure:2536: checking for perror declaration" >&5 +echo "configure:2537: checking for perror declaration" >&5 if eval "test \"`echo '$''{'cl_cv_proto_perror'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <, some in , some don't @@ -2554,7 +2555,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cl_cv_proto_perror=no else @@ -2576,7 +2577,7 @@ EOF fi echo $ac_n "checking whether characters are unsigned""... $ac_c" 1>&6 -echo "configure:2580: checking whether characters are unsigned" >&5 +echo "configure:2581: checking whether characters are unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2584,7 +2585,7 @@ else if test $ac_cv_prog_gcc = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else @@ -2660,7 +2661,7 @@ cl_machine_file_h=include/cl_intparam.h if test $cross_compiling = no; then if test -z "$cl_cv_file_intparam_h"; then echo "checking for integer types and behaviour" 1>&6 -echo "configure:2664: checking for integer types and behaviour" >&5 +echo "configure:2665: checking for integer types and behaviour" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:2676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } CC="$ORIGCC" if test -s conftest; then echo "creating $cl_machine_file_h" @@ -2698,7 +2699,7 @@ cl_machine_file_h=include/cl_floatparam.h if test $cross_compiling = no; then if test -z "$cl_cv_file_floatparam_h"; then echo "checking for floating-point types and behaviour" 1>&6 -echo "configure:2702: checking for floating-point types and behaviour" >&5 +echo "configure:2703: checking for floating-point types and behaviour" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:2714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } CC="$ORIGCC" if test -s conftest; then echo "creating $cl_machine_file_h" @@ -2735,17 +2736,19 @@ fi if test "${with_gmp+set}" = set; then withval="$with_gmp" : +else + with_gmp="yes" fi if test "$with_gmp" = yes; then echo $ac_n "checking for recent enough gmp.h""... $ac_c" 1>&6 -echo "configure:2743: checking for recent enough gmp.h" >&5 +echo "configure:2746: checking for recent enough gmp.h" >&5 if eval "test \"`echo '$''{'cl_cv_new_gmp_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if !defined(__GNU_MP_VERSION) || (__GNU_MP_VERSION < 3) @@ -2753,7 +2756,7 @@ else #endif EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2772,7 +2775,7 @@ echo "$ac_t""$cl_cv_new_gmp_h" 1>&6 if test "$cl_cv_new_gmp_h" = no; then with_gmp="no"; fi if test "$with_gmp" = yes; then echo $ac_n "checking for working libgmp""... $ac_c" 1>&6 -echo "configure:2776: checking for working libgmp" >&5 +echo "configure:2779: checking for working libgmp" >&5 if eval "test \"`echo '$''{'cl_cv_new_libgmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2780,14 +2783,14 @@ else SAVELIBS=$LIBS LIBS="$LIBS -lgmp" cat > conftest.$ac_ext < int main() { mpn_divexact_by3(0,0,0) ; return 0; } EOF -if { (eval echo configure:2791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cl_cv_new_libgmp="yes" else diff --git a/configure.in b/configure.in index e7ab6f3..0f2f32e 100644 --- a/configure.in +++ b/configure.in @@ -135,7 +135,8 @@ CL_MACHINE([floating-point types and behaviour],${srcdir}/autoconf/floatparam.c, dnl dnl interfacing to GNU gmp (must be at least version 3) dnl -AC_ARG_WITH(gmp, [ --with-gmp use external fast GNU gmp low-level functions]) +AC_ARG_WITH(gmp, [ --with-gmp use external fast low-level functions from GNU gmp3. + [default=yes]], ,with_gmp="yes") if test "$with_gmp" = yes; then dnl Is the gmp header file new enough? (i.e. >= 3.0) AC_CACHE_CHECK([for recent enough gmp.h], cl_cv_new_gmp_h, [