* Ralf Wildenhues wrote on Sun, Dec 04, 2005 at 03:56:15PM CET:
>
> I'll be replying to this mail with a number of patches, separated by
> logical changes, and *should* work in the order posted (I hope).
> - two patches for compatibility with older Automake
*snip*
Not really sure about how to handle old Automake versions.
The biggest question, testsuite-wise, is whether we should go back to
the old
AC_INIT
AM_INIT_AUTOMAKE(package, release)
scheme, and put automake options in Makefile.am's
AUTOMAKE_OPTIONS = ...
For now I have only done the latter. That way, the mechanism to detect
this and flag `expected failure' at least works with the old automake.
But this also means that we have very little actual test exposure
for versions <1.6.
Comments?
Cheers,
Ralf
* tests/am-subdir.at (Makefile.am): Put automake options here,
in AUTOMAKE_OPTIONS. Require 1.6 because of the newer
`AC_INIT(pkgname,version) AM_INIT_AUTOMAKE' scheme.
* tests/nonrecursive.at, tests/recursive.at: Require 1.7,
because libltdl rules use `+=' in conditionals.
* tests/testsuite.at (LT_AT_AUTOMAKE): Fix indenting.
(LT_AT_AUTORECONF): also detect too old Automake.
Index: tests/am-subdir.at
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/am-subdir.at,v
retrieving revision 1.10
diff -u -r1.10 am-subdir.at
--- tests/am-subdir.at 14 Nov 2005 22:19:40 -0000 1.10
+++ tests/am-subdir.at 4 Dec 2005 12:48:11 -0000
@@ -28,7 +28,7 @@
AT_DATA([[configure.ac]],
[[AC_INIT([subdir-demo], ]]AT_PACKAGE_VERSION[[, ]]AT_PACKAGE_BUGREPORT[[)
-AM_INIT_AUTOMAKE([subdir-objects foreign 1.5])
+AM_INIT_AUTOMAKE
LT_INIT([win32-dll])
AC_PROG_CC
AM_PROG_CC_C_O
@@ -38,6 +38,7 @@
AT_DATA([[Makefile.am]],
[[ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects foreign 1.6
AM_CPPFLAGS = -I$(top_srcdir)/../..
lib_LTLIBRARIES = subdir/libsub.la
@@ -89,7 +90,7 @@
AT_DATA([[configure.ac]],
[[AC_INIT([subdir-demo], ]]AT_PACKAGE_VERSION[[, ]]AT_PACKAGE_BUGREPORT[[)
-AM_INIT_AUTOMAKE([subdir-objects foreign 1.5])
+AM_INIT_AUTOMAKE
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_CXX
@@ -116,6 +117,7 @@
AT_DATA([[Makefile.am]],
[[ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects foreign 1.6
AM_CPPFLAGS = -I$(top_srcdir)/../..
lib_LTLIBRARIES = subdir/libsub.la
Index: tests/nonrecursive.at
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/nonrecursive.at,v
retrieving revision 1.5
diff -u -r1.5 nonrecursive.at
--- tests/nonrecursive.at 3 Dec 2005 08:49:48 -0000 1.5
+++ tests/nonrecursive.at 4 Dec 2005 12:48:11 -0000
@@ -38,6 +38,7 @@
AT_DATA([Makefile.am],
[[ACLOCAL_AMFLAGS = -I ltdl/m4
+AUTOMAKE_OPTIONS = 1.7
BUILT_SOURCES =
AM_CPPFLAGS =
Index: tests/recursive.at
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/recursive.at,v
retrieving revision 1.2
diff -u -r1.2 recursive.at
--- tests/recursive.at 14 Nov 2005 22:19:40 -0000 1.2
+++ tests/recursive.at 4 Dec 2005 12:48:11 -0000
@@ -36,6 +36,7 @@
AT_DATA([Makefile.am],
[[ACLOCAL_AMFLAGS = -I ltdl/m4
+AUTOMAKE_OPTIONS = 1.7
SUBDIRS = ltdl
lib_LTLIBRARIES = foo.la
foo_la_LDFLAGS = -module -avoid-version
Index: tests/testsuite.at
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/testsuite.at,v
retrieving revision 1.33
diff -u -r1.33 testsuite.at
--- tests/testsuite.at 3 Dec 2005 08:33:48 -0000 1.33
+++ tests/testsuite.at 4 Dec 2005 12:48:11 -0000
@@ -79,7 +80,7 @@
# --------------------------
m4_define([LT_AT_AUTOMAKE],
[AT_CHECK([$AUTOMAKE $1], [0], [ignore], [stderr],
-[AT_CHECK([grep 'require .*but have' stderr && (exit 77)], [1])])
+ [AT_CHECK([grep 'require .*but have' stderr && (exit 77)], [1])])
AT_XFAIL_IF([test "$AUTOMAKE" = no])
AT_KEYWORDS([automake])
])
@@ -97,7 +98,8 @@
# LT_AT_AUTORECONF([OPTIONS])
# --------------------------
m4_define([LT_AT_AUTORECONF],
-[AT_CHECK([$AUTORECONF $1], [0], [ignore], [ignore])
+[AT_CHECK([$AUTORECONF $1], [0], [ignore], [stderr],
+ [AT_CHECK([grep 'require .*but have' stderr && (exit 77)], [1])])
AT_XFAIL_IF(
[case ,$AUTORECONF,$AUTOCONF,$AUTOHEADER,$ACLOCAL,$AUTOMAKE, in *,no,*) :;;
*) false;; esac])
AT_KEYWORDS([autoconf automake])
