* libltdl/m4/ltdl.m4 (LTDL_CONVENIENCE, LTDL_INSTALLABLE): Remove

AC_SUBST of LIBLTDL, LTDLINCL, and all mention of INCLTDL.
(LT_WITH_LTDL): Due to order constraints between LTDL_CONVENIENCE,
LTDL_INSTALLABLE, LT_WITH_LTDL & LTDL_INIT, we can safely AC_SUBST
LIBLTDL and LTDLINCL here.  Also, remember to synch INCLTDL.

diff --git a/ChangeLog b/ChangeLog
index 814e23c12842b0182c1e05b02549978f86a92f3f..52ac60c8663ba70e682602052622e47cc33c376d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-10  Gary V. Vaughan  <gary@gnu.org>
+
+       * libltdl/m4/ltdl.m4 (LTDL_CONVENIENCE, LTDL_INSTALLABLE): Remove
+       AC_SUBST of LIBLTDL, LTDLINCL, and all mention of INCLTDL.
+       (LT_WITH_LTDL): Due to order constraints between LTDL_CONVENIENCE,
+       LTDL_INSTALLABLE, LT_WITH_LTDL & LTDL_INIT, we can safely AC_SUBST
+       LIBLTDL and LTDLINCL here.  Also, remember to synch INCLTDL.
+
 2005-10-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * tests/stresstest.at [ aix3, beos, os2 ]: Always use

diff --git a/libltdl/m4/ltdl.m4 b/libltdl/m4/ltdl.m4
index de4c655b972aa25c9076c6cba38368f6836d5705..a6063c5e6f3329fdd2f104559dc77d9e8e78a02e 100644 (file)
--- a/libltdl/m4/ltdl.m4
+++ b/libltdl/m4/ltdl.m4
@@ -63,13 +63,6 @@ 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,
@@ -119,13 +112,6 @@ 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,
@@ -198,6 +184,11 @@ 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: