From: Ralf Wildenhues Date: Sun, 7 Jun 2009 10:01:56 +0000 (+0200) Subject: testsuite: avoid failures due to old Automake. X-Git-Tag: v2.2.7b~82 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f578833bb8bd54092ce74f48ab07a26fdad28727;p=thirdparty%2Flibtool.git 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 --- diff --git a/ChangeLog b/ChangeLog index 2b31d08c4..e83a2fa28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2009-06-07 Ralf Wildenhues + 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 928bef58a..70e299de1 100644 --- 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 59738e0f5..20716463a 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 0ccabe89f..d37ec0588 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 =