From ea98cdc164b8837ff20d8906764a2e679686dd6b Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 4 Sep 2009 15:13:09 -0400
Subject: [PATCH] Try again to allow newer automake

---
 autogen.sh   | 12 ++++++++++--
 configure.in |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index d3fb066d3e..66e4f03357 100755
--- 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 84989a4a7f..18f63591b2 100644
--- 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