* 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 e491b92e568e3bac2a2300055e967dfa911554e0..406212e33d69028ebfce097619b309b11768ce67 100644 (file)
--- 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 aa4fcb0289f7370ede78b06e6f7ed37f4fcffde9..79cd479f46ec666e388a98f986ccce854f70ba72 100644 (file)
--- 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: