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 <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 2b31d08c4254ceb180384baded047558a544e322..e83a2fa280b82ae4019cf4185d0dd9aaa2b8e7d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2009-06-07  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       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 928bef58a730b8391d19f8817d1ff5b2440aeaa5..70e299de1cd5a173d74e7581af8510773e075922 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -140,6 +140,7 @@
   Ralf Menzel                  menzel@ls6.cs.uni-dortmund.de
   Richard Purdie               rpurdie@rpsys.net
   Richard Sandiford            richards@transitive.com
+  Robert Garron                        Robert.Garron@Access3000.net
   Robert Millan                        rmh@aybabtu.com
   Robert Ögren                        lists@roboros.com
   Roberto Bagnara              bagnara@cs.unipr.it

diff --git a/tests/configure-iface.at b/tests/configure-iface.at
index 59738e0f5080ab13a49fb48a21a0329e9969a1c0..20716463a53ea8927d1f705129466ed198b509d8 100644 (file)
--- 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 0ccabe89f8aefa667c6855f3ee06428b50e60e24..d37ec05883985496a5d4c7503c0ea464163be044 100644 (file)
--- 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            =