From: Gary V. Vaughan <gary@gnu.org>
Date: Fri, 2 Sep 2005 17:42:14 +0000 (+0000)
Subject: AC_BEFORE only works if declarations are made inside the macro
X-Git-Tag: release-2-1b~533
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=00d9e84dac5097ba9b36f74c0c813c5e6e5e1153;p=thirdparty%2Flibtool.git

AC_BEFORE only works if declarations are made inside the macro
cited as the first argument:

* libltdl/m4/libtool.m4 (LT_OUTPUT): Move AC_BEFORE decls...
(LT_INIT, LT_LANG): ...to the macro that has to come first.
---

diff --git a/ChangeLog b/ChangeLog
index 9fb5b8c38..243f1ddf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-09-02  Gary V. Vaughan  <gary@gnu.org>
+
+	AC_BEFORE only works if declarations are made inside the macro
+	cited as the first argument:
+
+	* libltdl/m4/libtool.m4 (LT_OUTPUT): Move AC_BEFORE decls...
+	(LT_INIT, LT_LANG): ...to the macro that has to come first.
+
 2005-09-01  Peter O'Gorman  <peter@pogma.com>
 
 	* libltdl/m4/libtool.m4 (old_postintall_cmds): chmod 644 before
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index a85b0674f..24c3d4267 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -56,6 +56,8 @@ m4_defun([LT_PREREQ],
 AC_DEFUN([LT_INIT],
 [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
 AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+
 dnl Autoconf doesn't catch unexpanded LT_ macros by default:
 m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
 m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW)$])dnl
@@ -534,11 +536,7 @@ _LT_OUTPUT_LIBTOOL_INIT
 # AC_OUTPUT is called), incase it is used in configure for compilation
 # tests.
 AC_DEFUN([LT_OUTPUT],
-[dnl This macro can only work once all the language testing is completed
-AC_BEFORE([LT_INIT], [LT_OUTPUT])
-AC_BEFORE([LT_LANG], [LT_OUTPUT])
-
-: ${CONFIG_LT=./config.lt}
+[: ${CONFIG_LT=./config.lt}
 AC_MSG_NOTICE([creating $CONFIG_LT])
 cat >"$CONFIG_LT" <<_LTEOF
 #! $SHELL
@@ -748,7 +746,8 @@ m4_define([_LT_TAGS], [])
 # -------------
 # Enable libtool support for the given language if not already enabled.
 AC_DEFUN([LT_LANG],
-[m4_case([$1],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
   [C],			[_LT_LANG(C)],
   [C++],		[_LT_LANG(CXX)],
   [Java],		[_LT_LANG(GCJ)],