diff --git a/ChangeLog b/ChangeLog index 58fe0d1..2e714b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,25 @@ +2000-05-30 Richard Kreckel + + * configure.in, autoconf/aclocal.m4 (CL_GMP_H_VERSION, CL_GMP_CHECK): + New macros. + * configure.in, include/cl_config.h.in (CL_VERSION, CL_VERSION_MINOR, + CL_VERSION_PATCHLEVEL): New definitions. + * autoconf/config.guess, autoconf/config.sub, autoconf/ltconfig, + autoconf/ltmain.sh: updated from FSF (libtool 1.3.5, etc). + * src/Makefile.in, configure.in: release-variables renamed from + CLN_* to CL_*. + * configure.in: default to build both shared and static library + (i.e. default to the most common behaviour). + 2000-05-29 Richard Kreckel * autoconf/aclocal.m4 (CL_CANONICAL_HOST): Added missing changequote - environment around the patch of 2000-05-23. + environment around the patch of 2000-05-23. 2000-05-29 Bruno Haible * autoconf/aclocal.m4 (CL_PROG_INSTALL): Fix typo. - Reported by Thomas Klausner . + Reported by Thomas Klausner . 2000-05-27 Richard Kreckel diff --git a/Makefile.devel b/Makefile.devel index 37eac94..5eda254 100644 --- a/Makefile.devel +++ b/Makefile.devel @@ -26,15 +26,15 @@ configures : $(CONFIGURES) configure : configure.in $(AUTOCONF_FILES) autoconf/autoconf -m autoconf -# ACLOCAL = /home/bruno/clisp/src/autoconf/aclocal.m4 -# ACSELECT = /home/bruno/clisp/src/autoconf/acselect -# OTHERMACROS = /home/bruno/clisp/src/autoconf/libtool.m4 -ACLOCAL = /home/kreckel/contrib/src/clisp/src/autoconf/aclocal.m4 -ACSELECT = /home/kreckel/contrib/src/clisp/src/autoconf/acselect -OTHERMACROS = /home/kreckel/contrib/src/clisp/src/autoconf/libtool.m4 - -autoconf/aclocal.m4 : $(ACLOCAL) - ($(ACSELECT) `cat $(CONFIGURES_IN) | grep '^[A-Z][A-Z]_' | sed 's,[^A-Z_].*$$,,g' | sort | uniq` < $(ACLOCAL) ; cat $(OTHERMACROS) | sed -e 's,AC_CANONICAL_HOST,CL_CANONICAL_HOST,g' -e 's,AC_PROG_RANLIB,CL_PROG_RANLIB,g') > autoconf/aclocal.m4 +# # ACLOCAL = /home/bruno/clisp/src/autoconf/aclocal.m4 +# # ACSELECT = /home/bruno/clisp/src/autoconf/acselect +# # OTHERMACROS = /home/bruno/clisp/src/autoconf/libtool.m4 +# ACLOCAL = /home/kreckel/contrib/src/clisp/src/autoconf/aclocal.m4 +# ACSELECT = /home/kreckel/contrib/src/clisp/src/autoconf/acselect +# OTHERMACROS = /home/kreckel/contrib/src/clisp/src/autoconf/libtool.m4 +# +# autoconf/aclocal.m4 : $(ACLOCAL) +# ($(ACSELECT) `cat $(CONFIGURES_IN) | grep '^[A-Z][A-Z]_' | sed 's,[^A-Z_].*$$,,g' | sort | uniq` < $(ACLOCAL) ; cat $(OTHERMACROS) | sed -e 's,AC_CANONICAL_HOST,CL_CANONICAL_HOST,g' -e 's,AC_PROG_RANLIB,CL_PROG_RANLIB,g') > autoconf/aclocal.m4 # Syntaxcheck check-configures : $(CONFIGURES) diff --git a/NEWS b/NEWS index a5e7980..1d75482 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -2000-05-xx, version 1.0.4 +2000-05-xx, version 1.1.0 ========================= Implementation changes diff --git a/autoconf/aclocal.m4 b/autoconf/aclocal.m4 index 6eed9be..29c3e99 100644 --- a/autoconf/aclocal.m4 +++ b/autoconf/aclocal.m4 @@ -937,3 +937,22 @@ NM="$ac_cv_path_NM" AC_MSG_RESULT([$NM]) AC_SUBST(NM) ]) + +# Is the gmp header file new enough? (should be implemented with an argument) +AC_DEFUN(CL_GMP_H_VERSION, +[AC_CACHE_CHECK([for recent enough gmp.h], cl_cv_new_gmp_h, [ + AC_TRY_CPP([#include +#if !defined(__GNU_MP_VERSION) || (__GNU_MP_VERSION < 3) + #error "ancient gmp.h" +#endif], +cl_cv_new_gmp_h="yes", cl_cv_new_gmp_h="no") +])])dnl + +# Does libgmp feature 3.0 functionality? +AC_DEFUN(CL_GMP_CHECK, +[AC_CACHE_CHECK([for working libgmp], cl_cv_new_libgmp, [ + SAVELIBS=$LIBS + LIBS="$LIBS -lgmp" + AC_TRY_LINK([#include ],[mpn_divexact_by3(0,0,0)], +cl_cv_new_libgmp="yes", cl_cv_new_libgmp="no"; LIBS=$SAVELIBS) +])]) diff --git a/autoconf/config.guess b/autoconf/config.guess index 0ce538b..b4faaed 100755 --- a/autoconf/config.guess +++ b/autoconf/config.guess @@ -2,7 +2,9 @@ # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 # Free Software Foundation, Inc. -# + +version='2000-05-30' + # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or @@ -36,6 +38,46 @@ # (but try to keep the structure clean). # +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of this system. + +Operation modes: + -h, --help print this help, then exit + -V, --version print version number, then exit" + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case "$1" in + --version | --vers* | -V ) + echo "$version" ; exit 0 ;; + --help | --h* | -h ) + echo "$usage"; exit 0 ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + exec >&2 + echo "$me: invalid option $1" + echo "$help" + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + # Use $HOST_CC if defined. $CC may point to a cross-compiler if test x"$CC_FOR_BUILD" = x; then if test x"$HOST_CC" != x; then @@ -726,6 +768,10 @@ EOF echo powerpc-unknown-linux-gnu${LIBC} exit 0 ;; + shelf_linux) + echo "${UNAME_MACHINE}-unknown-linux-gnu" + exit 0 + ;; esac if test "${UNAME_MACHINE}" = "alpha" ; then @@ -1178,6 +1224,47 @@ then esac fi -#echo '(Unable to guess system type)' 1>&2 +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess version = $version + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "version='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/autoconf/config.sub b/autoconf/config.sub index c8e7785..f414a43 100755 --- a/autoconf/config.sub +++ b/autoconf/config.sub @@ -2,7 +2,9 @@ # Configuration validation subroutine script, version 1.1. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 # Free Software Foundation, Inc. -# + +version='2000-05-30' + # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software # can handle that machine. It does not imply ALL GNU software can. @@ -50,23 +52,54 @@ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. -if [ x$1 = x ] -then - echo Configuration name missing. 1>&2 - echo "Usage: $0 CPU-MFR-OPSYS" 1>&2 - echo "or $0 ALIAS" 1>&2 - echo where ALIAS is a recognized configuration type. 1>&2 - exit 1 -fi +me=`echo "$0" | sed -e 's,.*/,,'` -# First pass through any local machine types. -case $1 in - *local*) - echo $1 - exit 0 - ;; - *) - ;; +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -V, --version print version number, then exit" + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case "$1" in + --version | --vers* | -V ) + echo "$version" ; exit 0 ;; + --help | --h* | -h ) + echo "$usage"; exit 0 ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + exec >&2 + echo "$me: invalid option $1" + echo "$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit 0;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; esac # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). @@ -1266,3 +1299,11 @@ case $basic_machine in esac echo $basic_machine$os +exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "version='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/autoconf/ltconfig b/autoconf/ltconfig index 7652504..1fe98a5 100755 --- a/autoconf/ltconfig +++ b/autoconf/ltconfig @@ -169,8 +169,8 @@ progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'` # Constants: PROGRAM=ltconfig PACKAGE=libtool -VERSION=1.3.4 -TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)" +VERSION=1.3.5 +TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)" ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' rm="rm -f" @@ -1164,15 +1164,21 @@ EOF # Extract the symbol export list from an `--export-all' def file, # then regenerate the def file from the symbol export list, so that # the compiled dll only exports the symbol export list. + # Be careful not to strip the DATA tag left by newer dlltools. export_symbols_cmds='test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~ test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~ $DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def $objdir/$soname-ltdll.$objext $libobjs $convenience~ - sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]* ; *//" < $objdir/$soname-def > $export_symbols' + sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $objdir/$soname-def > $export_symbols' + # If DATA tags from a recent dlltool are present, honour them! archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~ _lt_hint=1; - for symbol in `cat $export_symbols`; do - echo " \$symbol @ \$_lt_hint ; " >> $objdir/$soname-def; + cat $export_symbols | while read symbol; do + set dummy \$symbol; + case \$# in + 2) echo " \$2 @ \$_lt_hint ; " >> $objdir/$soname-def;; + *) echo " \$2 @ \$_lt_hint \$3 ; " >> $objdir/$soname-def;; + esac; _lt_hint=`expr 1 + \$_lt_hint`; done~ test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~ @@ -1433,7 +1439,13 @@ else hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: ;; - + rhapsody*) + archive_cmds='$CC -bundle -undefined suppress -o $lib $libobjs $deplibs $linkopts' + hardcode_libdir_flags_spec='-L$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + sco3.2v5*) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' hardcode_shlibpath_var=no @@ -1466,7 +1478,13 @@ else ;; sysv4) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $linkopts' + else + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' + fi runpath_var='LD_RUN_PATH' hardcode_shlibpath_var=no hardcode_direct=no #Motorola manual says yes, but my tests say they lie @@ -1632,11 +1650,11 @@ void nm_test_func(){} main(){nm_test_var='a';nm_test_func();return(0);} EOF - echo "$progname:1635: checking if global_symbol_pipe works" >&5 - if { (eval echo $progname:1636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then + echo "$progname:1653: checking if global_symbol_pipe works" >&5 + if { (eval echo $progname:1654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then # Now try to grab the symbols. nlist=conftest.nm - if { echo "$progname:1639: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then + if { echo "$progname:1657: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then @@ -1688,7 +1706,7 @@ EOF save_CFLAGS="$CFLAGS" LIBS="conftstm.$objext" CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo $progname:1691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + if { (eval echo $progname:1709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then pipe_works=yes else echo "$progname: failed program was:" >&5 @@ -1919,6 +1937,14 @@ hpux9* | hpux10* | hpux11*) soname_spec='${libname}${release}.sl$major' # HP-UX runs *really* slowly unless shared libraries are mode 555. postinstall_cmds='chmod 555 $lib' + case "$host_os" in + hpux10.20*) + # TODO: Does this work for hpux-11 too? + deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' + file_magic_cmd=/usr/bin/file + file_magic_test_file=/usr/lib/libc.sl + ;; + esac ;; irix5* | irix6*) @@ -1966,9 +1992,7 @@ linux-gnu*) finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no - deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' - file_magic_cmd=/usr/bin/file - file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` + deplibs_check_method=pass_all if test -f /lib/ld.so.1; then dynamic_linker='GNU ld.so' @@ -2029,6 +2053,14 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rhapsody*) + version_type=sunos + library_names_spec='${libname}.so' + soname_spec='${libname}.so' + shlibpath_var=DYLD_LIBRARY_PATH + deplibs_check_method=pass_all + ;; + sco3.2v5*) version_type=osf soname_spec='${libname}${release}.so$major' @@ -2069,6 +2101,10 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) soname_spec='${libname}${release}.so$major' shlibpath_var=LD_LIBRARY_PATH case "$host_vendor" in + sequent) + file_magic_cmd='/bin/file' + deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' + ;; ncr) deplibs_check_method='pass_all' ;; @@ -2209,7 +2245,7 @@ else if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then lt_cv_dlopen=no lt_cv_dlopen_libs= echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "$progname:2212: checking for dlopen in -ldl" >&5 +echo "$progname:2248: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2217,7 +2253,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo $progname:2269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2249,12 +2285,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "$progname:2252: checking for dlopen" >&5 +echo "$progname:2288: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2279,7 +2315,7 @@ dlopen(); ; return 0; } EOF -if { (eval echo $progname:2282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo $progname:2318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -2296,7 +2332,7 @@ if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 -echo "$progname:2299: checking for dld_link in -ldld" >&5 +echo "$progname:2335: checking for dld_link in -ldld" >&5 ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2304,7 +2340,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo $progname:2356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2336,12 +2372,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "$progname:2339: checking for shl_load" >&5 +echo "$progname:2375: checking for shl_load" >&5 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2366,7 +2402,7 @@ shl_load(); ; return 0; } EOF -if { (eval echo $progname:2369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo $progname:2405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else @@ -2384,7 +2420,7 @@ if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "$progname:2387: checking for shl_load in -ldld" >&5 +echo "$progname:2423: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2392,7 +2428,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo $progname:2445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2449,17 +2485,17 @@ fi for ac_hdr in dlfcn.h; do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "$progname:2452: checking for $ac_hdr" >&5 +echo "$progname:2488: 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 < int fnord = 0; EOF ac_try="$ac_compile >/dev/null 2>conftest.out" -{ (eval echo $progname:2462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo $progname:2498: \"$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* @@ -2487,7 +2523,7 @@ done LIBS="$lt_cv_dlopen_libs $LIBS" echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 -echo "$progname:2490: checking whether a program can dlopen itself" >&5 +echo "$progname:2526: checking whether a program can dlopen itself" >&5 if test "${lt_cv_dlopen_self+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2495,7 +2531,7 @@ else lt_cv_dlopen_self=cross else cat > conftest.c < @@ -2541,7 +2577,7 @@ main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW); if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } EOF -if { (eval echo $progname:2544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo $progname:2580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then lt_cv_dlopen_self=yes else @@ -2560,7 +2596,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6 if test "$lt_cv_dlopen_self" = yes; then LDFLAGS="$LDFLAGS $link_static_flag" echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 -echo "$progname:2563: checking whether a statically linked program can dlopen itself" >&5 +echo "$progname:2599: checking whether a statically linked program can dlopen itself" >&5 if test "${lt_cv_dlopen_self_static+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2568,7 +2604,7 @@ else lt_cv_dlopen_self_static=cross else cat > conftest.c < @@ -2614,7 +2650,7 @@ main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW); if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } EOF -if { (eval echo $progname:2617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo $progname:2653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then lt_cv_dlopen_self_static=yes else diff --git a/autoconf/ltmain.sh b/autoconf/ltmain.sh index 50515ad..766732d 100644 --- a/autoconf/ltmain.sh +++ b/autoconf/ltmain.sh @@ -54,8 +54,8 @@ modename="$progname" # Constants. PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.3.4 -TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)" +VERSION=1.3.5 +TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)" default_mode= help="Try \`$progname --help' for more information." @@ -1795,6 +1795,10 @@ compiler." *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) # these systems don't actually have a c library (as such)! ;; + *-*-rhapsody*) + # rhapsody is a little odd... + deplibs="$deplibs -framework System" + ;; *) # Add libc to deplibs on all other systems. deplibs="$deplibs -lc" @@ -2927,13 +2931,21 @@ else # Run the actual program with our arguments. " case $host in - *-*-cygwin* | *-*-mingw | *-*-os2*) # win32 systems need to use the prog path for dll # lookup to work + *-*-cygwin*) + $echo >> $output "\ + exec \$progdir/\$program \${1+\"\$@\"} +" + ;; + + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2*) $echo >> $output "\ exec \$progdir\\\\\$program \${1+\"\$@\"} " ;; + *) $echo >> $output "\ # Export the path to the program. diff --git a/configure b/configure index 43abfc2..577b6b2 100755 --- a/configure +++ b/configure @@ -12,7 +12,7 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help - --enable-shared build shared libraries [default=no] + --enable-shared build shared libraries [default=yes] --enable-shared=PKGS only build shared libraries if the current package appears as an element in the PKGS list" ac_help="$ac_help @@ -1331,7 +1331,7 @@ no) enable_shared=no ;; ;; esac else - enable_shared=no + enable_shared=yes fi # Check whether --enable-static or --disable-static was given. @@ -1545,11 +1545,27 @@ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } -CLN_CURRENT=0 -CLN_REVISION=1 -CLN_AGE=0 +CL_CURRENT=1 +CL_REVISION=0 +CL_AGE=0 + +CL_VERSION=1 +CL_VERSION_MINOR=1 +CL_VERSION_PATCHLEVEL=0 +cat >> confdefs.h <> confdefs.h <> confdefs.h <&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cl_cv_cplusplus_bool=yes else @@ -1614,7 +1630,7 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for long long type""... $ac_c" 1>&6 -echo "configure:1618: checking for long long type" >&5 +echo "configure:1634: 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 @@ -1623,7 +1639,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:1667: \"$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 @@ -1680,7 +1696,7 @@ EOF esac echo $ac_n "checking for long double type""... $ac_c" 1>&6 -echo "configure:1684: checking for long double type" >&5 +echo "configure:1700: 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 @@ -1689,7 +1705,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:1717: \"$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 @@ -1730,20 +1746,20 @@ EOF esac echo $ac_n "checking for working template<>""... $ac_c" 1>&6 -echo "configure:1734: checking for working template<>" >&5 +echo "configure:1750: 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:1747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cl_cv_c_templatenull=yes else @@ -1767,7 +1783,7 @@ fi if test -n "$GCC"; then echo $ac_n "checking for the global constructors function prefix""... $ac_c" 1>&6 -echo "configure:1771: checking for the global constructors function prefix" >&5 +echo "configure:1787: 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 @@ -1777,7 +1793,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:1781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } >/dev/null 2>&1 +{ ac_try='${CXX-g++} $CXXFLAGS -S conftest.cc'; { (eval echo configure:1797: \"$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 @@ -1807,7 +1823,7 @@ EOF EOF echo $ac_n "checking whether the global constructors function need to be exported""... $ac_c" 1>&6 -echo "configure:1811: checking whether the global constructors function need to be exported" >&5 +echo "configure:1827: 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 @@ -1828,7 +1844,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:1832: \"$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:1848: \"$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 @@ -1850,17 +1866,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1854: checking for $ac_hdr" >&5 +echo "configure:1870: 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:1864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1880: \"$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* @@ -1890,20 +1906,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:1894: checking for working alloca.h" >&5 +echo "configure:1910: 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:1907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1923: \"$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 @@ -1945,20 +1961,20 @@ char *alloca (); #endif " echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1949: checking for alloca" >&5 +echo "configure:1965: 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:1978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cl_cv_func_alloca=yes else @@ -1990,20 +2006,20 @@ EOF fi echo $ac_n "checking for fpu_control_t""... $ac_c" 1>&6 -echo "configure:1994: checking for fpu_control_t" >&5 +echo "configure:2010: 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:2007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cl_cv_type_fpu_control_t=yes else @@ -2025,20 +2041,20 @@ EOF fi echo $ac_n "checking for __setfpucw""... $ac_c" 1>&6 -echo "configure:2029: checking for __setfpucw" >&5 +echo "configure:2045: 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:2042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cl_cv_func_setfpucw=yes else @@ -2064,12 +2080,12 @@ fi for ac_func in gettimeofday do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2068: checking for $ac_func" >&5 +echo "configure:2084: 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:2115: \"$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 @@ -2120,13 +2136,13 @@ fi done if test $ac_cv_func_gettimeofday = yes; then echo $ac_n "checking for gettimeofday declaration""... $ac_c" 1>&6 -echo "configure:2124: checking for gettimeofday declaration" >&5 +echo "configure:2140: 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 < @@ -2147,7 +2163,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2167: \"$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 *" @@ -2156,7 +2172,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -2177,7 +2193,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2197: \"$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 *" @@ -2218,12 +2234,12 @@ fi for ac_func in ftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2222: checking for $ac_func" >&5 +echo "configure:2238: 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:2269: \"$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 @@ -2275,12 +2291,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:2279: checking for times" >&5 +echo "configure:2295: 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:2326: \"$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 @@ -2327,7 +2343,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:2331: checking for times return value" >&5 +echo "configure:2347: 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 @@ -2336,7 +2352,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:2366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2382: \"$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 @@ -2400,17 +2416,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2404: checking for $ac_hdr" >&5 +echo "configure:2420: 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:2414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2430: \"$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* @@ -2437,13 +2453,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:2441: checking for getrusage" >&5 +echo "configure:2457: 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 @@ -2452,7 +2468,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:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cl_cv_func_getrusage=yes else @@ -2474,13 +2490,13 @@ EOF fi if test $cl_cv_func_getrusage = yes; then echo $ac_n "checking for getrusage declaration""... $ac_c" 1>&6 -echo "configure:2478: checking for getrusage declaration" >&5 +echo "configure:2494: 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 < @@ -2506,7 +2522,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cl_cv_proto_getrusage_arg1="int" else @@ -2533,13 +2549,13 @@ EOF fi echo $ac_n "checking for perror declaration""... $ac_c" 1>&6 -echo "configure:2537: checking for perror declaration" >&5 +echo "configure:2553: 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 @@ -2555,7 +2571,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2575: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cl_cv_proto_perror=no else @@ -2577,7 +2593,7 @@ EOF fi echo $ac_n "checking whether characters are unsigned""... $ac_c" 1>&6 -echo "configure:2581: checking whether characters are unsigned" >&5 +echo "configure:2597: 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 @@ -2585,7 +2601,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:2640: \"$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 @@ -2661,7 +2677,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:2665: checking for integer types and behaviour" >&5 +echo "configure:2681: checking for integer types and behaviour" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:2692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } CC="$ORIGCC" if test -s conftest; then echo "creating $cl_machine_file_h" @@ -2699,7 +2715,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:2703: checking for floating-point types and behaviour" >&5 +echo "configure:2719: checking for floating-point types and behaviour" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:2730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } CC="$ORIGCC" if test -s conftest; then echo "creating $cl_machine_file_h" @@ -2741,14 +2757,14 @@ else fi if test "$with_gmp" = yes; then - echo $ac_n "checking for recent enough gmp.h""... $ac_c" 1>&6 -echo "configure:2746: checking for recent enough gmp.h" >&5 +echo $ac_n "checking for recent enough gmp.h""... $ac_c" 1>&6 +echo "configure:2762: 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 < conftest.$ac_ext < #if !defined(__GNU_MP_VERSION) || (__GNU_MP_VERSION < 3) @@ -2756,7 +2772,7 @@ else #endif EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2776: \"$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* @@ -2774,8 +2790,8 @@ fi 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:2779: checking for working libgmp" >&5 +echo $ac_n "checking for working libgmp""... $ac_c" 1>&6 +echo "configure:2795: 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 @@ -2783,14 +2799,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:2794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cl_cv_new_libgmp="yes" else @@ -2972,9 +2988,9 @@ s%@LD@%$LD%g s%@NM@%$NM%g s%@LN_S@%$LN_S%g s%@LIBTOOL@%$LIBTOOL%g -s%@CLN_CURRENT@%$CLN_CURRENT%g -s%@CLN_REVISION@%$CLN_REVISION%g -s%@CLN_AGE@%$CLN_AGE%g +s%@CL_CURRENT@%$CL_CURRENT%g +s%@CL_REVISION@%$CL_REVISION%g +s%@CL_AGE@%$CL_AGE%g s%@ALLOCA@%$ALLOCA%g CEOF diff --git a/configure.in b/configure.in index 0f2f32e..5f15a4d 100644 --- a/configure.in +++ b/configure.in @@ -65,22 +65,31 @@ dnl dnl check for build configuration dnl PACKAGE=cln -AM_DISABLE_SHARED AM_PROG_LIBTOOL dnl Libtool's library version information for CLN. -dnl (Not to be confused with CLN's release number.) +dnl (Not to be confused with CLN's release version.) dnl Making new releases: dnl * increment CLN_REVISION, dnl * if any functions/classes have been added, removed or changed, increment dnl CLN_CURRENT and set CLN_REVISION to 0, dnl * if any functions/classes have been added, increment CLN_AGE, dnl * if backwards compatibility has been broken, set CLN_AGE to 0. -CLN_CURRENT=0 -CLN_REVISION=1 -CLN_AGE=0 -AC_SUBST(CLN_CURRENT) -AC_SUBST(CLN_REVISION) -AC_SUBST(CLN_AGE) +CL_CURRENT=1 +CL_REVISION=0 +CL_AGE=0 +dnl make substitutions +AC_SUBST(CL_CURRENT) +AC_SUBST(CL_REVISION) +AC_SUBST(CL_AGE) +dnl release version +CL_VERSION=1 +CL_VERSION_MINOR=1 +CL_VERSION_PATCHLEVEL=0 +dnl release version for cl_config.h, so it can be tested by the preprocessor +AC_DEFINE_UNQUOTED(CL_VERSION, $CL_VERSION) +AC_DEFINE_UNQUOTED(CL_VERSION_MINOR, $CL_VERSION_MINOR) +AC_DEFINE_UNQUOTED(CL_VERSION_PATCHLEVEL, $CL_VERSION_PATCHLEVEL) + dnl sets variable LIBTOOL dnl dnl checks for compiler characteristics @@ -135,28 +144,15 @@ 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 low-level functions from GNU gmp3. +AC_ARG_WITH(gmp, [ --with-gmp use external fast low-level functions from GNU MP 3. [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, [ - AC_TRY_CPP([#include -#if !defined(__GNU_MP_VERSION) || (__GNU_MP_VERSION < 3) - #error "ancient gmp.h" -#endif], -cl_cv_new_gmp_h="yes", cl_cv_new_gmp_h="no") -]) -if test "$cl_cv_new_gmp_h" = no; then with_gmp="no"; fi -if test "$with_gmp" = yes; then -dnl Does the library match the header file have 3.0 features? - AC_CACHE_CHECK([for working libgmp], cl_cv_new_libgmp, [ - SAVELIBS=$LIBS - LIBS="$LIBS -lgmp" - AC_TRY_LINK([#include ],[mpn_divexact_by3(0,0,0)], -cl_cv_new_libgmp="yes", cl_cv_new_libgmp="no"; LIBS=$SAVELIBS) -]) -if test "$cl_cv_new_libgmp" = no; then with_gmp="no"; fi -fi + CL_GMP_H_VERSION + if test "$cl_cv_new_gmp_h" = no; then with_gmp="no"; fi + if test "$with_gmp" = yes; then + CL_GMP_CHECK + if test "$cl_cv_new_libgmp" = no; then with_gmp="no"; fi + fi fi if test "$with_gmp" = yes; then AC_DEFINE(CL_USE_GMP) diff --git a/include/cl_config.h.in b/include/cl_config.h.in index de06402..c9cb2f6 100644 --- a/include/cl_config.h.in +++ b/include/cl_config.h.in @@ -5,6 +5,14 @@ /* These definitions are adjusted by `configure' automatically. */ + +/* release version */ + +#undef CL_VERSION +#undef CL_VERSION_MINOR +#undef CL_VERSION_PATCHLEVEL + + /* CPU */ #ifndef __i386__ #undef __i386__ diff --git a/src/Makefile.in b/src/Makefile.in index 2c7466c..7f36763 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -40,9 +40,9 @@ LN = ln RM = rm -f @SET_MAKE@ # Libtool's library interface versions: -CLN_CURRENT = @CLN_CURRENT@ -CLN_REVISION = @CLN_REVISION@ -CLN_AGE = @CLN_AGE@ +CL_CURRENT = @CL_CURRENT@ +CL_REVISION = @CL_REVISION@ +CL_AGE = @CL_AGE@ # Programs used by "make install": INSTALL = @INSTALL@ @@ -196,7 +196,7 @@ $(SUBDIRS_DIRDEP) : %.dirdep : ifeq ($(SUBDIR),.) libcln.la : $(LIBTOOL) $(ALLOBJECTS_LO) - $(LIBTOOL_LINK) $(CC) -o libcln.la -rpath $(libdir) -version-info $(CLN_CURRENT):$(CLN_REVISION):$(CLN_AGE) $(LDFLAGS) $(LIBS) $(ALLOBJECTS_LO) + $(LIBTOOL_LINK) $(CC) -o libcln.la -rpath $(libdir) -version-info $(CL_CURRENT):$(CL_REVISION):$(CL_AGE) $(LDFLAGS) $(LIBS) $(ALLOBJECTS_LO) install : all force if [ ! -d $(libdir) ] ; then mkdir $(libdir) ; fi