From: Gary V. Vaughan <gary@gnu.org>
Date: Tue, 1 Nov 2005 14:32:18 +0000 (+0000)
Subject: * libltdl/m4/ltdl.m4 (LTDL_INIT): Call _LT_ENABLE_INSTALL directly
X-Git-Tag: release-2-1b~437
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8c879bb97afcf60736a3c1f4c89969946c8b0ba;p=thirdparty%2Flibtool.git

* libltdl/m4/ltdl.m4 (LTDL_INIT): Call _LT_ENABLE_INSTALL directly
instead of m4_requiring it, as it relies on enable_ltdl_install
and enable_ltdl_convenience to have been initialised first.
---

diff --git a/ChangeLog b/ChangeLog
index 999721f9e..f338a842f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-11-01  Gary V. Vaughan  <gary@gnu.org>
 
+	* libltdl/m4/ltdl.m4 (LTDL_INIT): Call _LT_ENABLE_INSTALL directly
+	instead of m4_requiring it, as it relies on enable_ltdl_install
+	and enable_ltdl_convenience to have been initialised first.
+
 	* libtoolize.m4sh: Use serial tags to locate the correct serial
 	numbers when deciding whether to update.
 	(func_serial): Allow for macro_regex argument to be originating
diff --git a/libltdl/m4/ltdl.m4 b/libltdl/m4/ltdl.m4
index e4a54864a..62c162ec2 100644
--- a/libltdl/m4/ltdl.m4
+++ b/libltdl/m4/ltdl.m4
@@ -229,9 +229,12 @@ AC_REQUIRE([gl_FUNC_ARGZ])dnl
 
 m4_require([_LT_CHECK_OBJDIR])dnl
 m4_require([_LT_HEADER_DLFCN])dnl
-m4_require([_LT_ENABLE_INSTALL])dnl
 m4_require([_LT_CHECK_DLPREOPEN])dnl
 
+dnl Don't require this, or it will be expanded earlier that the code
+dnl that sets the variables it relies on:
+_LT_ENABLE_INSTALL
+
 dnl Although deprecated and no longer documented, alpha releases of
 dnl libtool used to define an LTDL_INIT to take a DIRECTORY orgument.
 dnl If LT_CONFIG_LTDL_DIR was called already, but LTDL_INIT was given a
@@ -276,7 +279,7 @@ dnl AC_DEFUN([AC_LIB_LTDL], [])
 
 # _LT_ENABLE_INSTALL
 # ------------------
-m4_defun([_LT_ENABLE_INSTALL],
+m4_define([_LT_ENABLE_INSTALL],
 [AC_ARG_ENABLE([ltdl-install],
     [AS_HELP_STRING([--enable-ltdl-install], [install libltdl])])