[SCM] GNU Libtool branch, master, updated. v2.2.6-124-gf578833

[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  f578833bb8bd54092ce74f48ab07a26fdad28727 (commit)
      from  d812c6326b9f1206715f1125970805a05a856e32 (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 f578833bb8bd54092ce74f48ab07a26fdad28727
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Jun 7 12:01:56 2009 +0200

    testsuite: avoid failures due to old Automake.
    
    * tests/configure-iface.at (installable libltdl)
    (--with-ltdl-include/lib, --with-included-ltdl):
    Speficy libmodule_la_SOURCES in Makefile.am as the default
    source file naming scheme changed in Automake 1.8.
    * tests/nonrecursive.at (_LT_AT_LTDL_SETUP): Require Automake
    1.9.6.
    * THANKS: Update.
    Report by Robert Garron.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog                |   10 ++++++++++
 THANKS                   |    1 +
 tests/configure-iface.at |    9 +++++++++
 tests/nonrecursive.at    |    4 ++--
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2b31d08..e83a2fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2009-06-07  Ralf Wildenhues  <address@hidden>
 
+       testsuite: avoid failures due to old Automake.
+       * tests/configure-iface.at (installable libltdl)
+       (--with-ltdl-include/lib, --with-included-ltdl):
+       Speficy libmodule_la_SOURCES in Makefile.am as the default
+       source file naming scheme changed in Automake 1.8.
+       * tests/nonrecursive.at (_LT_AT_LTDL_SETUP): Require Automake
+       1.9.6.
+       * THANKS: Update.
+       Report by Robert Garron.
+
        testsuite: add missing @LIBS@ in a link command line.
        * tests/old-m4-iface.at (AC_WITH_LTDL): Use @LIBS@ when linking.
        Report by Patrice Fromy.
diff --git a/THANKS b/THANKS
index 928bef5..70e299d 100644
--- a/THANKS
+++ b/THANKS
@@ -140,6 +140,7 @@
   Ralf Menzel                  address@hidden
   Richard Purdie               address@hidden
   Richard Sandiford            address@hidden
+  Robert Garron                        address@hidden
   Robert Millan                        address@hidden
   Robert Ögren                        address@hidden
   Roberto Bagnara              address@hidden
diff --git a/tests/configure-iface.at b/tests/configure-iface.at
index 59738e0..2071646 100644
--- a/tests/configure-iface.at
+++ b/tests/configure-iface.at
@@ -127,6 +127,9 @@ SUBDIRS                     = libltdl
 AM_CPPFLAGS            = $(LTDLINCL)
 
 lib_LTLIBRARIES                = libmodule.la
+# Automake < 1.8 will use libmodule.la.c as default source,
+# while newer will choose libmodule.c; so specify it here.
+libmodule_la_SOURCES   = libmodule.c
 libmodule_la_LDFLAGS   = -module
 
 bin_PROGRAMS           = main
@@ -196,6 +199,9 @@ AT_DATA([Makefile.am],
 AM_CPPFLAGS            = $(LTDLINCL)
 
 lib_LTLIBRARIES                = libmodule.la
+# Automake < 1.8 will use libmodule.la.c as default source,
+# while newer will choose libmodule.c; so specify it here.
+libmodule_la_SOURCES   = libmodule.c
 libmodule_la_LDFLAGS   = -module
 
 bin_PROGRAMS           = main
@@ -262,6 +268,9 @@ SUBDIRS                     = libltdl
 AM_CPPFLAGS            = $(LTDLINCL)
 
 lib_LTLIBRARIES                = libmodule.la
+# Automake < 1.8 will use libmodule.la.c as default source,
+# while newer will choose libmodule.c; so specify it here.
+libmodule_la_SOURCES   = libmodule.c
 libmodule_la_LDFLAGS   = -module
 
 bin_PROGRAMS           = main
diff --git a/tests/nonrecursive.at b/tests/nonrecursive.at
index 0ccabe8..d37ec05 100644
--- a/tests/nonrecursive.at
+++ b/tests/nonrecursive.at
@@ -1,6 +1,6 @@
 # nonrecursive.at -- test nonrecursive Automake Libltdl       -*- Autotest -*-
 #
-#   Copyright (C) 2005, 2008 Free Software Foundation, Inc.
+#   Copyright (C) 2005, 2008, 2009 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2005
 #
 #   This file is part of GNU Libtool.
@@ -46,7 +46,7 @@ AC_OUTPUT
 
 AT_DATA([Makefile.am],
 [[ACLOCAL_AMFLAGS = -I ltdl/m4
-AUTOMAKE_OPTIONS       = 1.7
+AUTOMAKE_OPTIONS       = 1.9.6
 BUILT_SOURCES          =
 
 AM_CPPFLAGS            =


hooks/post-receive
-- 
GNU Libtool