X-Git-Url: https://ginac.de/CLN/cln.git//cln.git?a=blobdiff_plain;f=configure.ac;h=f8a8fa945c7c3fb537ec03dae7845963cdf5f346;hb=5a524da0e894352a8c0d15c5e07d0b73452d790b;hp=bae9d184550a53515e99b93d4f59aa9d52e297c6;hpb=e939a0df3300afe9876fe3a81b1de40101d3374d;p=cln.git

diff --git a/configure.ac b/configure.ac
index bae9d18..f8a8fa9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ dnl
 dnl
 AC_INIT(src/integer/gcd/cl_I_gcd.cc)
 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_CONFIG_HEADER(include/cln/config.h include/cln/version.h src/base/cl_base_config.h src/base/cl_gmpconfig.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.
@@ -92,7 +92,7 @@ dnl * if backwards compatibility has been broken, set CL_AGE to 0.
 dnl $(CL_CURRENT):$(CL_REVISION):$(CL_AGE) results in
 dnl libcln.so.$(CL_CURRENT)-$(CL_AGE)
 CL_CURRENT=5
-CL_REVISION=0
+CL_REVISION=2
 CL_AGE=0
 dnl make substitutions
 AC_SUBST(CL_CURRENT)
@@ -101,7 +101,7 @@ AC_SUBST(CL_AGE)
 dnl release version
 CL_VERSION_MAJOR=1
 CL_VERSION_MINOR=2
-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)
@@ -135,8 +135,6 @@ dnl           checks for functions and declarations
 dnl
 CL_ALLOCA
                       dnl set variable ALLOCA, DEFS NO_ALLOCA
-CL_FPU_CONTROL
-                      dnl DEFS HAVE_FPU_CONTROL_T, HAVE_SETFPUCW
 CL_GETTIMEOFDAY
                       dnl DEFS HAVE_GETTIMEOFDAY, GETTIMEOFDAY_DOTS, GETTIMEOFDAY_TZP_T
 ac_cv_func_ftime=no
@@ -147,35 +145,26 @@ CL_RUSAGE
                       dnl DEFS HAVE_SYS_RESOURCE_H, HAVE_GETRUSAGE, HAVE_SYS_TIMES_H
 CL_PERROR
                       dnl DEFS HAVE_PERROR_DECL
+CL_ATTRIBUTE_FLATTEN
+                      dnl DEFS CL_HAVE_ATTRIBUTE_FLATTEN
 dnl
 dnl           checks for compiler characteristics
 dnl
 AC_C_CHAR_UNSIGNED
                       dnl DEFS __CHAR_UNSIGNED__ if char is unsigned
-test -d 'include/cln' || mkdir -p 'include/cln'
+
+dnl Create a subdirectory in the ${top_builddir} to hold auto-generated
+dnl headers. This subdirectory does not exist when ${top_builddir} != ${top_srcdir}
+dnl (a.k.a. "VPATH build").
+if test ! -d include/cln; then
+	AS_MKDIR_P([include/cln])
+fi
 CL_MACHINE([integer types and behaviour],${srcdir}/autoconf/intparam.c,[CL_INTPARAM_CROSS],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,[CL_FLOATPARAM_CROSS],include/cln/floatparam.h,cl_cv_file_floatparam_h)
                       dnl builds include/cln/floatparam.h
-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 MP 3.
-                          [default=yes]], ,with_gmp="yes")
-if test "$with_gmp" = yes; then
-  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
-  CL_GMP_SET_UINTD
-  AC_DEFINE(CL_USE_GMP)
-else
-  AC_MSG_WARN([disabling external GNU MP library])
-fi
+CL_LIBGMP
+                      dnl DEFS CL_USE_GMP, GMP_DEMANDS_UINTD_*
 dnl
 dnl           That's it.
 dnl