[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[patch 09/19] 293-gary-default-convenience-ltdl.diff Queue
From: |
Gary V. Vaughan |
Subject: |
[patch 09/19] 293-gary-default-convenience-ltdl.diff Queue |
Date: |
Mon, 10 Oct 2005 11:26:33 +0100 |
User-agent: |
quilt/0.42-1 |
libltdl/m4/ltdl.m4 | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
Index: libtool--devo--1.0/ChangeLog
from Gary V. Vaughan <address@hidden>
* 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.
Index: libtool--devo--1.0/libltdl/m4/ltdl.m4
===================================================================
--- libtool--devo--1.0.orig/libltdl/m4/ltdl.m4
+++ libtool--devo--1.0/libltdl/m4/ltdl.m4
@@ -247,9 +247,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
@@ -297,7 +300,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])])
--
Gary V. Vaughan ())_. address@hidden,gnu.org}
Research Scientist ( '/ http://tkd.kicks-ass.net
GNU Hacker / )= http://www.gnu.org/software/libtool
Technical Author `(_~)_ http://sources.redhat.com/autobook
- [patch 06/19] 289-gary-LT_WITH_LTDL-nonrecursive.diff Queue, (continued)
[patch 08/19] 292-gary-remove-spurious-quotes.diff Queue, Gary V. Vaughan, 2005/10/10
[patch 09/19] 293-gary-default-convenience-ltdl.diff Queue,
Gary V. Vaughan <=
[patch 10/19] 294-gary-libltdl-configure-messages.diff Queue, Gary V. Vaughan, 2005/10/10
[patch 11/19] 295-gary-dont-force-ac-config-headers-on-subproject-ltdl.diff Queue, Gary V. Vaughan, 2005/10/10
[patch 12/19] 296-gary-ltdl-recursive-tests.diff Queue, Gary V. Vaughan, 2005/10/10