X-Git-Url: https://ginac.de/CLN/cln.git//cln.git?a=blobdiff_plain;f=configure.ac;h=13a798f8eb16a738ea1277bcef6afae6ba3af0f5;hb=22549ef70fee95faab1e9f2adaf710ba9e0bdabf;hp=a52b58c6dd53bfb131c9fea02233296db41c869f;hpb=697c3c7f8041deb0f55b60ece032e58633e0fb83;p=cln.git

diff --git a/configure.ac b/configure.ac
index a52b58c..13a798f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,16 +41,18 @@ d
 dnl
 dnl           checks for programs
 dnl
-AC_PROG_CC
+CL_PROG_CC
                       dnl sets variable CC
 AC_PROG_CPP
                       dnl sets variable CPP
-AC_PROG_CXX
+CL_PROG_CXX
                       dnl sets variable CXX
 AC_PROG_CXXCPP
                       dnl sets variable CXXCPP
 CL_AS_UNDERSCORE
                       dnl sets variable AS_UNDERSCORE, DEFS ASM_UNDERSCORE
+CL_AS_NOEXECSTACK
+                      dnl sets variable ASMFLAGS
 AC_PROG_RANLIB
                       dnl sets variable RANLIB
 AC_PROG_INSTALL
@@ -67,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
 
@@ -78,8 +89,10 @@ dnl * if any functions/classes have been added, removed or changed, increment
 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=5
+dnl $(CL_CURRENT):$(CL_REVISION):$(CL_AGE) results in
+dnl libcln.so.$(CL_CURRENT)-$(CL_AGE)
+CL_CURRENT=5
+CL_REVISION=0
 CL_AGE=0
 dnl make substitutions
 AC_SUBST(CL_CURRENT)
@@ -87,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=6
+CL_VERSION_MINOR=2
+CL_VERSION_PATCHLEVEL=0
 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)
@@ -126,6 +139,8 @@ 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
+                      dnl don't use ftime(3) even if it's available
 CL_TIMES_CLOCK
                       dnl DEFS HAVE_TIMES_CLOCK
 CL_RUSAGE
@@ -138,15 +153,17 @@ 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,include/cln/intparam.h,cl_cv_file_intparam_h)
+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,include/cln/floatparam.h,cl_cv_file_floatparam_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")
+AC_ARG_WITH(gmp, AS_HELP_STRING([--with-gmp], 
+  [use external fast low-level functions from GNU MP (default: yes).]),
+  with_gmp="$withval",
+  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
@@ -174,4 +191,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])