Author: forenr
Date: Thu Dec 30 03:47:54 2010
New Revision: 37045
URL: http://www.lyx.org/trac/changeset/37045

Log:
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

Modified:
   lyx-devel/branches/BRANCH_1_6_X/autogen.sh
   lyx-devel/branches/BRANCH_1_6_X/config/libtool.m4
   lyx-devel/branches/BRANCH_1_6_X/status.16x

Modified: lyx-devel/branches/BRANCH_1_6_X/autogen.sh
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/autogen.sh  Wed Dec 29 22:34:33 2010        
(r37044)
+++ lyx-devel/branches/BRANCH_1_6_X/autogen.sh  Thu Dec 30 03:47:54 2010        
(r37045)
@@ -38,11 +38,11 @@
 
 
 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

Modified: lyx-devel/branches/BRANCH_1_6_X/config/libtool.m4
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/config/libtool.m4   Wed Dec 29 22:34:33 
2010        (r37044)
+++ lyx-devel/branches/BRANCH_1_6_X/config/libtool.m4   Thu Dec 30 03:47:54 
2010        (r37045)
@@ -362,7 +362,7 @@
 # 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/ {

Modified: lyx-devel/branches/BRANCH_1_6_X/status.16x
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/status.16x  Wed Dec 29 22:34:33 2010        
(r37044)
+++ lyx-devel/branches/BRANCH_1_6_X/status.16x  Thu Dec 30 03:47:54 2010        
(r37045)
@@ -46,6 +46,7 @@
 
 * BUILD/INSTALLATION
 
+- Allow using autoconf 2.66 and 2.68.
 
 
 

Reply via email to