Fix default argument for AC_LIBLTDL_CONVENIENCE.

* libltdl/m4/ltdl.m4 (AC_LIBLTDL_CONVENIENCE): Default argument
to libltdl.
(AC_LIBLTDL_INSTALLABLE): Likewise.
* tests/configure-iface.at (convenience libltdl): New test.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 081f8fc8c3ff9b885b681d27e76c07daab08fcab..2beeb45a003319bc260a2916d1a0d03fe648b199 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-22  Andreas Schwab <schwab@suse.de>
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Fix default argument for AC_LIBLTDL_CONVENIENCE.
+       * libltdl/m4/ltdl.m4 (AC_LIBLTDL_CONVENIENCE): Default argument
+       to libltdl.
+       (AC_LIBLTDL_INSTALLABLE): Likewise.
+       * tests/configure-iface.at (convenience libltdl): New test.
+
 2008-04-21  Gary V. Vaughan  <gary@gnu.org>
 
        Capture lt~obsolete.m4 serial number correctly in libtoolize.

diff --git a/libltdl/m4/ltdl.m4 b/libltdl/m4/ltdl.m4
index bdecc9df971ed0e687531da360d08a21d63dbbeb..f6b1064003539a2078c444f019d6c1398860e85a 100644 (file)
--- a/libltdl/m4/ltdl.m4
+++ b/libltdl/m4/ltdl.m4
@@ -79,7 +79,7 @@ _$0()
 # AC_LIBLTDL_CONVENIENCE accepted a directory argument in older libtools,
 # now we have LT_CONFIG_LTDL_DIR:
 AU_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[_LT_CONFIG_LTDL_DIR([$1])
+[_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
 _LTDL_CONVENIENCE])
 
 dnl aclocal-1.4 backwards compatibility:
@@ -135,7 +135,7 @@ _$0()
 # AC_LIBLTDL_INSTALLABLE accepted a directory argument in older libtools,
 # now we have LT_CONFIG_LTDL_DIR:
 AU_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[_LT_CONFIG_LTDL_DIR([$1])
+[_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
 _LTDL_INSTALLABLE])
 
 dnl aclocal-1.4 backwards compatibility:

diff --git a/tests/configure-iface.at b/tests/configure-iface.at
index 3fcb0dac79adc86bdffb01a113c8294b6e08242d..9a311dc8abaf78f63bf145cc43445034b39172f5 100644 (file)
--- a/tests/configure-iface.at
+++ b/tests/configure-iface.at
@@ -275,5 +275,33 @@ AT_CHECK([$MAKE -q main$EXEEXT || exit 1], [1], [ignore], [ignore])
 
 AT_CLEANUP
 
+
+## -------------------- ##
+## Convenience libltdl. ##
+## -------------------- ##
+
+AT_SETUP([convenience libltdl])
+
+AT_DATA([configure.ac],
+[[AC_INIT
+AC_CONFIG_AUX_DIR([libltdl/config])
+AC_LIBLTDL_CONVENIENCE
+AC_LIBTOOL_DLOPEN
+AC_PROG_LIBTOOL
+AC_CONFIG_FILES(Makefile)
+AC_OUTPUT
+]])
+AT_DATA([Makefile.in],
+[[LIBLTDL = @LIBLTDL@
+print-ltdl:
+       echo $(LIBLTDL)
+]])
+
+LT_AT_BOOTSTRAP([--ltdl], [-I libltdl/m4], [ignore], [ignore], [], [], [ignore])
+AT_CHECK([$MAKE print-ltdl], [], [stdout])
+AT_CHECK([grep libltdl/libltdlc.la stdout], [], [ignore])
+
+AT_CLEANUP
+
 dnl Be careful not to let the definition leak into other tests
 m4_popdef([_LT_AT_LTDL_SETUP])