From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Tue, 11 Oct 2005 11:25:08 +0000 (+0000)
Subject: * libltdl/m4/ltdl.m4 (LTDL_CONVENIENCE, LTDL_INSTALLABLE)
X-Git-Tag: release-2-1b~464
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35fc3630d853054f9e541d76bd642eb932d55d52;p=thirdparty%2Flibtool.git

* libltdl/m4/ltdl.m4 (LTDL_CONVENIENCE, LTDL_INSTALLABLE)
(LT_WITH_LTDL): Revert Gary's 2005-10-10 patch.
---

diff --git a/ChangeLog b/ChangeLog
index e491b92e5..406212e33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-10-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	* libltdl/m4/ltdl.m4 (LTDL_CONVENIENCE, LTDL_INSTALLABLE)
+	(LT_WITH_LTDL): Revert Gary's 2005-10-10 patch.
+
 	* tests/stresstest.at: Use `allow_undefined_flag' instead of
 	host_os setting.
 
diff --git a/libltdl/m4/ltdl.m4 b/libltdl/m4/ltdl.m4
index aa4fcb028..79cd479f4 100644
--- a/libltdl/m4/ltdl.m4
+++ b/libltdl/m4/ltdl.m4
@@ -63,6 +63,13 @@ case $enable_ltdl_convenience in
   esac
 LIBLTDL='${top_builddir}'"${lt_ltdl_dir+/$lt_ltdl_dir}/libltdlc.la"
 LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
+
+AC_SUBST([LIBLTDL])
+AC_SUBST([LTDLINCL])
+
+# For backwards non-gettext consistent compatibility...
+INCLTDL="$LTDLINCL"
+AC_SUBST([INCLTDL])
 ])# LTDL_CONVENIENCE
 
 # AC_LIBLTDL_CONVENIENCE accepted a directory argument in older libtools,
@@ -112,6 +119,13 @@ else
   LIBLTDL="-lltdl"
   LTDLINCL=
 fi
+
+AC_SUBST([LIBLTDL])
+AC_SUBST([LTDLINCL])
+
+# For backwards non-gettext consistent compatibility...
+INCLTDL="$LTDLINCL"
+AC_SUBST([INCLTDL])
 ])# LTDL_INSTALLABLE
 
 # AC_LIBLTDL_INSTALLABLE accepted a directory argument in older libtools,
@@ -184,11 +198,6 @@ AC_PROVIDE_IFELSE([LTDL_INIT],
 	[],
     [LTDL_INIT
     AC_DEFUN([LTDL_INIT], [])])
-
-AC_SUBST([LIBLTDL])
-AC_SUBST([LTDLINCL])
-dnl For backwards non-gettext consistent compatibility...
-AC_SUBST([INCLTDL], ["$LTDLINCL"])
 ])# LT_WITH_LTDL
 
 # Old name: