X-Git-Url: https://ginac.de/CLN/cln.git//cln.git?a=blobdiff_plain;f=configure.ac;h=4911a8b8462666c69d619d9a6570da4f19d5532e;hb=684ae5ac173cba2b80173348b225ba4dc2ece6a4;hp=e1959c751d8ca2bd07c41193a86ed2fd3b472145;hpb=6617af27549271eccd05cab1df478e0484ae8907;p=cln.git

diff --git a/configure.ac b/configure.ac
index e1959c7..4911a8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,9 +51,9 @@ AC_PROG_CXXCPP
                       dnl sets variable CXXCPP
 CL_AS_UNDERSCORE
                       dnl sets variable AS_UNDERSCORE, DEFS ASM_UNDERSCORE
-CL_PROG_RANLIB
+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,7 +65,6 @@ CL_CANONICAL_HOST_CPU
 dnl
 dnl           check for build configuration
 dnl
-                      dnl libcln depends on libm
 PACKAGE=cln
                       dnl libtool wants PACKAGE
 AC_PROG_LIBTOOL
@@ -79,8 +78,8 @@ 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=3
+CL_CURRENT=3
+CL_REVISION=1
 CL_AGE=0
 dnl make substitutions
 AC_SUBST(CL_CURRENT)
@@ -89,7 +88,7 @@ AC_SUBST(CL_AGE)
 dnl release version
 CL_VERSION_MAJOR=1
 CL_VERSION_MINOR=1
-CL_VERSION_PATCHLEVEL=4
+CL_VERSION_PATCHLEVEL=7
 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 +103,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 +126,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,7 +137,7 @@ 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)
@@ -181,4 +176,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])