Try again to allow newer automake

diff --git a/autogen.sh b/autogen.sh
index d3fb066d3e1933a9acd2b631452ccff48c7b8df6..66e4f033575a5ff4e14c9e8900c315dfbabee110 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -45,16 +45,24 @@ fi
        DIE=1
 }
 
-if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then
+if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then
+    AUTOMAKE=automake-1.11
+    ACLOCAL=aclocal-1.11
+else if automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then
+    AUTOMAKE=automake-1.10
+    ACLOCAL=aclocal-1.10
+else if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then
     AUTOMAKE=automake-1.7
     ACLOCAL=aclocal-1.7
 else
        echo
-       echo "You must have automake 1.7.x installed to compile $PROJECT."
+       echo "You must have automake 1.7.x, 1,10.x or 1.11.x installed to compile $PROJECT."
        echo "Install the appropriate package for your distribution,"
        echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
        DIE=1
 fi
+fi
+fi
 
 if test "$DIE" -eq 1; then
        exit 1

diff --git a/configure.in b/configure.in
index 84989a4a7f9af14663484f95d5c73058615a4b5c..18f63591b273014a05b2378c91d2e38da0600baf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -307,6 +307,7 @@ AM_SANITY_CHECK
 # Checks for programs.
 AC_ISC_POSIX
 AM_PROG_CC_STDC
+AM_PROG_CC_C_O
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET