Play nicely with Autoconf 2.68

diff --git a/.bzrignore b/.bzrignore
index 150c85c8e411e76136edf02898f010129caa1bc6..ced9bf5d7c7fbf4caa899a504efb2649cf6e0fe3 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -205,3 +205,4 @@ clients/rtpmon
 libtests/t-resample
 clients/resample
 disobedience/manual/Makefile
 libtests/t-resample
 clients/resample
 disobedience/manual/Makefile

+./m4

diff --git a/Makefile.am b/Makefile.am
index b41014f52b6b97dc04fb1b567632208878d5b588..5599ffd00a188df4bdb85f02d726356cead0573e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,6 +22,8 @@ SUBDIRS=@subdirs@
 
 DISTCHECK_CONFIGURE_FLAGS:=httpdir=$(distdir)/_inst/httpdir cgiexecdir=$(shell pwd)/$(distdir)/_inst/cgiexecdir
 
 
 DISTCHECK_CONFIGURE_FLAGS:=httpdir=$(distdir)/_inst/httpdir cgiexecdir=$(shell pwd)/$(distdir)/_inst/cgiexecdir
 

+ACLOCAL_AMFLAGS=-I m4
+

 check-report: before-check check make-coverage-reports
 before-check:
        rm -f */*.gcda */*.gcov
 check-report: before-check check make-coverage-reports
 before-check:
        rm -f */*.gcda */*.gcov

diff --git a/acinclude.m4 b/acinclude.m4
index 6df1aa39b4048130b4dacf642f1547e45939a760..5ab86727bf3fc512afe005b2c8847ec5d3c67f90 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -17,9 +17,9 @@
 
 AC_DEFUN([RJK_FIND_GC_H],[
   AC_CACHE_CHECK([looking for <gc.h>],[rjk_cv_gc_h],[
 
 AC_DEFUN([RJK_FIND_GC_H],[
   AC_CACHE_CHECK([looking for <gc.h>],[rjk_cv_gc_h],[

-    AC_PREPROC_IFELSE([
+    AC_PREPROC_IFELSE([AC_LANG_PROGRAM([

                       #include <gc.h>
                       #include <gc.h>

-                     ],
+                     ],[])],

                      [rjk_cv_gc_h="on default include path"],[
       oldCPPFLAGS="${CPPFLAGS}"
       for dir in /usr/include/gc /usr/local/include/gc; do
                      [rjk_cv_gc_h="on default include path"],[
       oldCPPFLAGS="${CPPFLAGS}"
       for dir in /usr/include/gc /usr/local/include/gc; do


@@ -28,9 +28,9 @@ AC_DEFUN([RJK_FIND_GC_H],[
        else
          CPPFLAGS="${oldCPPFLAGS} -I$dir"
        fi
        else
          CPPFLAGS="${oldCPPFLAGS} -I$dir"
        fi

-       AC_PREPROC_IFELSE([
+       AC_PREPROC_IFELSE([AC_LANG_PROGRAM([

                           #include <gc.h>
                           #include <gc.h>

-                         ],
+                         ],[])],

                          [rjk_cv_gc_h=$dir;break],[rjk_cv_gc_h="not found"])
       done
       CPPFLAGS="${oldCPPFLAGS}"
                          [rjk_cv_gc_h=$dir;break],[rjk_cv_gc_h="not found"])
       done
       CPPFLAGS="${oldCPPFLAGS}"

diff --git a/configure.ac b/configure.ac
index 1d81d832d429ac8f8b1668be1325b21b4d80a169..2abd3278fa77bf95a94b79d7667f02d1271188f3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,6 +23,7 @@ AC_CONFIG_AUX_DIR([config.aux])
 AM_INIT_AUTOMAKE(disorder, [5.0])
 AC_CONFIG_SRCDIR([server/disorderd.c])
 AM_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE(disorder, [5.0])
 AC_CONFIG_SRCDIR([server/disorderd.c])
 AM_CONFIG_HEADER([config.h])

+AC_CONFIG_MACRO_DIR([m4])

 
 # Find host type
 AC_CANONICAL_HOST
 
 # Find host type
 AC_CANONICAL_HOST


@@ -655,7 +656,7 @@ AC_CHECK_FUNCS([fls getfsstat])
 if test $want_server = yes; then
   # <db.h> had better be version 3 or later
   AC_CACHE_CHECK([db.h version],[rjk_cv_db_version],[
 if test $want_server = yes; then
   # <db.h> had better be version 3 or later
   AC_CACHE_CHECK([db.h version],[rjk_cv_db_version],[

-    AC_PREPROC_IFELSE([
+    AC_PREPROC_IFELSE([AC_LANG_PROGRAM([

                       #include <db.h>
                       #ifndef DB_VERSION_MAJOR
                       # error cannot determine db version
                       #include <db.h>
                       #ifndef DB_VERSION_MAJOR
                       # error cannot determine db version


@@ -666,16 +667,16 @@ if test $want_server = yes; then
                       #if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR <= 2
                       # error inadequate db version
                       #endif
                       #if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR <= 2
                       # error inadequate db version
                       #endif

-                     ],
+                     ],[])],

                      [rjk_cv_db_version=ok],
                      [rjk_cv_db_version=inadequate])
     if test $rjk_cv_db_version = ok; then
                      [rjk_cv_db_version=ok],
                      [rjk_cv_db_version=inadequate])
     if test $rjk_cv_db_version = ok; then

-      AC_PREPROC_IFELSE([
+      AC_PREPROC_IFELSE([AC_LANG_PROGRAM([

                          #include <db.h>
                          #if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 6
                          # error http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=510270
                          #endif
                          #include <db.h>
                          #if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 6
                          # error http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=510270
                          #endif

-                        ],
+                        ],[])],

                         [rjk_cv_db_version=ok],
                         [rjk_cv_db_version=toxic])
     fi
                         [rjk_cv_db_version=ok],
                         [rjk_cv_db_version=toxic])
     fi


@@ -727,13 +728,13 @@ if test "x$GCC" = xyes; then
     if test $GCC = yes; then
       CC="$CC -Wall -Werror"
     fi
     if test $GCC = yes; then
       CC="$CC -Wall -Werror"
     fi

-    AC_COMPILE_IFELSE([
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[

       static int x(char *f) {
        return *f;
       }
       int z(const char *g) {
        return x((char *)g);
       static int x(char *f) {
        return *f;
       }
       int z(const char *g) {
        return x((char *)g);

-      }],
+      }])],

       [rjk_cv_pr29478=no],
       [rjk_cv_pr29478=yes]
     )
       [rjk_cv_pr29478=no],
       [rjk_cv_pr29478=yes]
     )


@@ -749,11 +750,11 @@ if test "x$GCC" = xyes; then
     if test $GCC = yes; then
       CC="$CC -Wreturn-type -Werror"
     fi
     if test $GCC = yes; then
       CC="$CC -Wreturn-type -Werror"
     fi

-    AC_COMPILE_IFELSE([
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[

       static void *threadfn(void) {
         for(;;)
           ;
       static void *threadfn(void) {
         for(;;)
           ;

-      }],
+      }],[])],

       [rjk_cv_gcc44_stupidity=no],
       [rjk_cv_gcc44_stupidity=yes])
     CC="$old_CC"
       [rjk_cv_gcc44_stupidity=no],
       [rjk_cv_gcc44_stupidity=yes])
     CC="$old_CC"