summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2018-09-07 13:43:11 +0200
committerJörg Frings-Fürst <debian@jff.email>2018-09-07 13:43:11 +0200
commit66dfd6613394a8903701840bbc9d67de537e597e (patch)
tree3b0943539a09fe5322b0b984222abb7c60ddfacb /configure.ac
parent6bf91b141b7b3e3524f422d4c18bccf7f87aecd1 (diff)
parent52796af94a055f1c704a604f4eac567242c845b7 (diff)
Merge branch 'release/debian/6.9.0-1'debian/6.9.0-1
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac20
1 files changed, 10 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index cec8aa6..fef00cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(onig, 6.8.2)
+AC_INIT(onig, 6.9.0)
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([-Wno-portability 1.14])
-AC_CONFIG_HEADER(src/config.h)
+AC_CONFIG_HEADERS([src/config.h])
dnl default value for STATISTICS
@@ -39,7 +39,7 @@ fi
dnl Checks for programs.
AC_PROG_CC
-AM_PROG_LIBTOOL
+LT_INIT
LTVERSION="5:0:0"
AC_SUBST(LTVERSION)
@@ -64,15 +64,17 @@ AC_FUNC_ALLOCA
AC_FUNC_MEMCMP
AC_CACHE_CHECK(for prototypes, _cv_have_prototypes,
- [AC_TRY_COMPILE([int foo(int x) { return 0; }], [return foo(10);],
- _cv_have_prototypes=yes,
- _cv_have_prototypes=no)])
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[int foo(int x) { return 0; }]],
+ [[return foo(10);]])],
+ [_cv_have_prototypes=yes],
+ [_cv_have_prototypes=no])])
if test "$_cv_have_prototypes" = yes; then
AC_DEFINE(HAVE_PROTOTYPES,1,[Define if compilerr supports prototypes])
fi
AC_CACHE_CHECK(for variable length prototypes and stdarg.h, _cv_stdarg,
- [AC_TRY_COMPILE([
+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <stdarg.h>
int foo(int x, ...) {
va_list va;
@@ -82,9 +84,7 @@ int foo(int x, ...) {
va_arg(va, double);
return 0;
}
-], [return foo(10, "", 3.14);],
- _cv_stdarg=yes,
- _cv_stdarg=no)])
+]], [[return foo(10, "", 3.14);]])],[_cv_stdarg=yes],[_cv_stdarg=no])])
if test "$_cv_stdarg" = yes; then
AC_DEFINE(HAVE_STDARG_PROTOTYPES,1,[Define if compiler supports stdarg prototypes])
fi