Interoperability with gcc-3.0 -fuse-cxa-atexit.

[cln.git] / configure.in

diff --git a/configure.in b/configure.in
index 03cd01d7f461d43f46bbdde4c5ebea5d196a1029..68ffa38404e1261367fc75cc5721f57a7dbe6f80 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,4 @@
 dnl  AUTOCONF configuration for CLN
-dnl  Bruno Haible 8.1.1999
 dnl
 dnl  configure.in ---<autoconf>--->> configure
 dnl
@@ -13,7 +12,8 @@ dnl  Makefile   ---<make>--->> libcln.a
 dnl
 dnl
 AC_INIT(src/integer/gcd/cl_I_gcd.cc)
-AC_CONFIG_HEADER(include/cln/config.h src/base/cl_base_config.h src/base/cl_gmpconfig.h src/float/cl_float_config.h src/timing/cl_t_config.h)
+AC_CONFIG_AUX_DIR(autoconf)
+AC_CONFIG_HEADER(include/cln/config.h include/cln/version.h src/base/cl_base_config.h src/base/cl_gmpconfig.h src/float/cl_float_config.h src/timing/cl_t_config.h)
 AC_PROG_MAKE_SET
 dnl This piece of sed script replaces every line containing '@subdir@'
 dnl by several consecutive lines, each referencing one subdir.
@@ -65,7 +65,6 @@ CL_CANONICAL_HOST_CPU
 dnl
 dnl           check for build configuration
 dnl
-LIBS=-lm
                       dnl libcln depends on libm
 PACKAGE=cln
                       dnl libtool wants PACKAGE
@@ -75,13 +74,13 @@ AM_PROG_LIBTOOL
 dnl Libtool's library version information for CLN.
 dnl (Not to be confused with CLN's release version.)
 dnl Making new releases:
-dnl * increment CLN_REVISION,
+dnl * increment CL_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.
-CL_CURRENT=1
-CL_REVISION=0
+dnl   CL_CURRENT and set CL_REVISION to 0,
+dnl * if any functions/classes have been added, increment CL_AGE,
+dnl * if backwards compatibility has been broken, set CL_AGE to 0.
+CL_CURRENT=2
+CL_REVISION=1
 CL_AGE=0
 dnl make substitutions
 AC_SUBST(CL_CURRENT)
@@ -90,12 +89,12 @@ AC_SUBST(CL_AGE)
 dnl release version
 CL_VERSION_MAJOR=1
 CL_VERSION_MINOR=1
-CL_VERSION_PATCHLEVEL=0
+CL_VERSION_PATCHLEVEL=2
 dnl release version for cln/config.h, so it can be tested by the preprocessor
 AC_DEFINE_UNQUOTED(CL_VERSION_MAJOR, $CL_VERSION_MAJOR)
 AC_DEFINE_UNQUOTED(CL_VERSION_MINOR, $CL_VERSION_MINOR)
 AC_DEFINE_UNQUOTED(CL_VERSION_PATCHLEVEL, $CL_VERSION_PATCHLEVEL)
-dnl concateneted release version
+dnl concatenated release version
 CL_VERSION=$CL_VERSION_MAJOR.$CL_VERSION_MINOR.$CL_VERSION_PATCHLEVEL
 AC_DEFINE_UNQUOTED(CL_VERSION, $CL_VERSION)
 AC_SUBST(CL_VERSION)
@@ -145,7 +144,7 @@ dnl           checks for compiler characteristics
 dnl
 CL_CHAR_UNSIGNED
                       dnl DEFS __CHAR_UNSIGNED__ if char is unsigned
-test -d 'include' || mkdir 'include'
+test -d 'include/cln' || mkdir -p 'include/cln'
 CL_MACHINE([integer types and behaviour],${srcdir}/autoconf/intparam.c,include/cln/intparam.h,cl_cv_file_intparam_h)
                       dnl builds include/cln/intparam.h
 CL_MACHINE([floating-point types and behaviour],${srcdir}/autoconf/floatparam.c,include/cln/floatparam.h,cl_cv_file_floatparam_h)
@@ -164,6 +163,7 @@ if test "$with_gmp" = yes; then
   fi
 fi
 if test "$with_gmp" = yes; then
+  CL_GMP_SET_UINTD
   AC_DEFINE(CL_USE_GMP)
 else
   AC_MSG_WARN([disabling external GNU MP library])
@@ -181,4 +181,4 @@ changequote([,])dnl
     cp "$srcdir/$f" "$f"
   fi
 done
-AC_OUTPUT([Makefile src/Makefile tests/Makefile benchmarks/Makefile examples/Makefile doc/Makefile cln-config], [chmod +x cln-config])
+AC_OUTPUT([Makefile src/Makefile tests/Makefile benchmarks/Makefile examples/Makefile doc/Makefile cln-config cln-config.1 cln.spec], [chmod +x cln-config])