From 7fb335c9ae85059534b04cf5376a7e23a0e536c7 Mon Sep 17 00:00:00 2001
From: Enrico Forestieri <forenr@lyx.org>
Date: Thu, 30 Dec 2010 02:47:54 +0000
Subject: [PATCH] Allow using autoconf 2.66 and 2.68 (both work flawlessly with
 LyX) and avoid the warnings issued by AC_LINK_IFELSE if the first argument is
 not conforming. See
 http://lists.gnu.org/archive/html/autoconf/2010-09/msg00069.html

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@37045 a592a061-630c-0410-9148-cb99ea01b6c8
---
 autogen.sh        | 4 ++--
 config/libtool.m4 | 2 +-
 status.16x        | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 25b9292033..082be43b75 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -38,11 +38,11 @@ test "$autoversion" != "" && {
 
 
 case $autoversion in
-    *' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-57])
+    *' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-8])
 	;;
     *)
 	echo "This autoconf version is not supported by LyX."
-	echo "LyX only supports autoconf 2.59c-2.65, 2.67."
+	echo "LyX only supports autoconf 2.59c-2.68."
 	exit 1
 	;;
 esac
diff --git a/config/libtool.m4 b/config/libtool.m4
index 3ae0a21ac8..6fe27cc129 100644
--- a/config/libtool.m4
+++ b/config/libtool.m4
@@ -362,7 +362,7 @@ AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
 # to the aix ld manual.
 AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
 [AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],[
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
 	/^0/ {
diff --git a/status.16x b/status.16x
index b85623b72f..75d9b75b41 100644
--- a/status.16x
+++ b/status.16x
@@ -46,6 +46,7 @@ What's new
 
 * BUILD/INSTALLATION
 
+- Allow using autoconf 2.66 and 2.68.