* 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.

diff --git a/ChangeLog b/ChangeLog
index 66ee8d01067c3e2ffcba3cf63706caaf24c85d88..43370cb33138622251679ffeafebed13b07b7468 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-12-16  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+       * 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.
+
 2005-12-08  Eric Blake  <ebb9@byu.net>
 
        * libltdl/libltdl/lt__alloc.h (FREE): Cast away constness of

diff --git a/tests/am-subdir.at b/tests/am-subdir.at
index 18d77a50fd77c6d0e8c24b4cc981da31aeff2e28..7cc47d2506556bf1d3d1c4d8905ef3b7a0f33923 100644 (file)
--- a/tests/am-subdir.at
+++ b/tests/am-subdir.at
@@ -28,7 +28,7 @@ AT_SETUP([C subdir-objects])
 
 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 @@ AC_OUTPUT
 
 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 @@ LT_AT_TAG([CXX])
 
 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 @@ AC_OUTPUT
 
 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

diff --git a/tests/nonrecursive.at b/tests/nonrecursive.at
index 155a8dafbae96a072b5ec0e15c52e06b3317fbf9..66e9d849334b3d600c84472f879712a2f8195dcd 100644 (file)
--- a/tests/nonrecursive.at
+++ b/tests/nonrecursive.at
@@ -38,6 +38,7 @@ AC_OUTPUT
 
 AT_DATA([Makefile.am],
 [[ACLOCAL_AMFLAGS = -I ltdl/m4
+AUTOMAKE_OPTIONS       = 1.7
 BUILT_SOURCES          =
 
 AM_CPPFLAGS            =

diff --git a/tests/recursive.at b/tests/recursive.at
index 3273e5121c42f3f31b40c8b41f715a3df512fb76..780e665a8be417e81e17f7a0e2c8f0c1d8ae4f32 100644 (file)
--- a/tests/recursive.at
+++ b/tests/recursive.at
@@ -36,6 +36,7 @@ AC_OUTPUT
 
 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

diff --git a/tests/testsuite.at b/tests/testsuite.at
index 13de1045407ab32ecfcf34ac587ddc815e475a4e..7c8478fc8ab471db9d528e81d1fa2485e48b2115 100644 (file)
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -79,7 +79,7 @@ AT_KEYWORDS([autoconf])
 # --------------------------
 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 +97,8 @@ AT_KEYWORDS([autoconf])
 # 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])