Fix hack from 2008-01-20 that broke on ARM.

[cln.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1e6ce03757c6c52a5e3d7ec575da34462ada64e0..051223eda50ff766a7b09102e1bd88f64a6d5baa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -69,6 +69,15 @@ dnl           check for build configuration
 dnl
 PACKAGE=cln
                       dnl libtool wants PACKAGE
+case $host_os in
+    *mingw*)
+     AC_DISABLE_SHARED
+  dnl Shared libraries are not supported on some platforms [yet]
+    ;;
+    *)
+     AC_ENABLE_SHARED
+    ;;
+esac
 AC_PROG_LIBTOOL
                       dnl sets variable LIBTOOL
 
@@ -82,7 +91,7 @@ dnl * if any functions/classes have been added, increment CL_AGE,
 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=4
+CL_CURRENT=5
 CL_REVISION=1
 CL_AGE=0
 dnl make substitutions
@@ -91,8 +100,8 @@ AC_SUBST(CL_REVISION)
 AC_SUBST(CL_AGE)
 dnl release version
 CL_VERSION_MAJOR=1
-CL_VERSION_MINOR=1
-CL_VERSION_PATCHLEVEL=11
+CL_VERSION_MINOR=2
+CL_VERSION_PATCHLEVEL=1
 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)
@@ -138,35 +147,19 @@ 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'
 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
@@ -180,4 +173,4 @@ changequote([,])dnl
     cp "$srcdir/$f" "$f"
   fi
 done
-AC_OUTPUT([Makefile src/Makefile tests/Makefile benchmarks/Makefile examples/Makefile doc/Makefile cln-config cln-config.1 cln.spec cln.pc], [chmod +x cln-config])
+AC_OUTPUT([Makefile src/Makefile tests/Makefile benchmarks/Makefile examples/Makefile doc/Makefile cln.spec cln.pc])