[SCM] GNU Libtool branch, master, updated. release-2-2-2-21-g9b00a3a

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  9b00a3a6e7d231440029d8be120dff7faa15320e (commit)
      from  6a30ffc8e42860cb8b7320d2555973c823325157 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9b00a3a6e7d231440029d8be120dff7faa15320e
Author: Andreas Schwab <address@hidden>
Date:   Tue Apr 22 21:32:32 2008 +0200

    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 <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                |    9 +++++++++
 libltdl/m4/ltdl.m4       |    4 ++--
 tests/configure-iface.at |   28 ++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 081f8fc..2beeb45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-22  Andreas Schwab <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       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  <address@hidden>
 
        Capture lt~obsolete.m4 serial number correctly in libtoolize.
diff --git a/libltdl/m4/ltdl.m4 b/libltdl/m4/ltdl.m4
index bdecc9d..f6b1064 100644
--- 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 3fcb0da..9a311dc 100644
--- 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])


hooks/post-receive
--
GNU Libtool