X-Git-Url: https://ginac.de/CLN/cln.git//cln.git?a=blobdiff_plain;f=configure.ac;h=13b220fa7f6e26f1c6c205a97efe239ac94c2106;hb=2a184ae6be29c5218f80a94d473302ec93767700;hp=91a0dc08fb81d19f6517b299ad4e08e2d7543b1c;hpb=df7f7906ab815762ce8167ee0f988833a75807ee;p=cln.git

diff --git a/configure.ac b/configure.ac
index 91a0dc0..13b220f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,19 +41,21 @@ 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_PROG_RANLIB
+CL_AS_NOEXECSTACK
+                      dnl sets variable ASMFLAGS
+AC_PROG_RANLIB
                       dnl sets variable RANLIB
-CL_PROG_INSTALL
+AC_PROG_INSTALL
                       dnl sets variables INSTALL, INSTALL_DATA, INSTALL_PROGRAM
 dnl
 dnl           check for host type
@@ -65,9 +67,17 @@ CL_CANONICAL_HOST_CPU
 dnl
 dnl           check for build configuration
 dnl
-                      dnl libcln depends on libm
 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
 
@@ -79,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=4
+dnl $(CL_CURRENT):$(CL_REVISION):$(CL_AGE) results in
+dnl libcln.so.$(CL_CURRENT)-$(CL_AGE)
+CL_CURRENT=4
+CL_REVISION=1
 CL_AGE=0
 dnl make substitutions
 AC_SUBST(CL_CURRENT)
@@ -89,7 +101,7 @@ AC_SUBST(CL_AGE)
 dnl release version
 CL_VERSION_MAJOR=1
 CL_VERSION_MINOR=1
-CL_VERSION_PATCHLEVEL=5
+CL_VERSION_PATCHLEVEL=12
 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)
@@ -104,20 +116,16 @@ dnl           checks for compiler characteristics
 dnl
 AC_LANG_CPLUSPLUS
 dnl
-CL_BOOL
-                      dnl DEFS HAVE_BOOL, bool
 CL_LONGLONG
                       dnl DEFS HAVE_LONGLONG
 CL_LONGDOUBLE
                       dnl DEFS HAVE_LONGDOUBLE
-CL_TEMPLATE_NULL
-                      dnl DEFS HAVE_TEMPLATE_NULL
 CL_GLOBAL_CONSTRUCTORS
                       dnl DEFS CL_GLOBAL_CONSTRUCTOR_PREFIX, CL_GLOBAL_DESTRUCTOR_PREFIX
 dnl
 dnl           checks for header files
 dnl
-CL_UNISTD_H
+AC_CHECK_HEADERS([unistd.h])
                       dnl DEFS HAVE_UNISTD_H if exist unistd.h
 dnl
 dnl           checks for typedefs
@@ -131,8 +139,8 @@ CL_FPU_CONTROL
                       dnl DEFS HAVE_FPU_CONTROL_T, HAVE_SETFPUCW
 CL_GETTIMEOFDAY
                       dnl DEFS HAVE_GETTIMEOFDAY, GETTIMEOFDAY_DOTS, GETTIMEOFDAY_TZP_T
-CL_FTIME
-                      dnl DEFS HAVE_FTIME
+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
@@ -142,12 +150,12 @@ CL_PERROR
 dnl
 dnl           checks for compiler characteristics
 dnl
-CL_CHAR_UNSIGNED
+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)
@@ -181,4 +189,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], [chmod +x cln-config])
+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])