diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-05 21:48:49 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-05 21:56:42 +0200 |
| commit | 68075ce0b2c88cb6972031b9bb3505338c5ab321 (patch) | |
| tree | 2d46c32d0435699e37a4997fcc3fc3cb3ec22c73 /t/objc-megademo.sh | |
| parent | 4094eb3eeb89758ac625e678d1351162172bb4d7 (diff) | |
| download | automake-68075ce0b2c88cb6972031b9bb3505338c5ab321.tar.gz | |
require: autoconf >= 2.65; related simplifications
The new support for Objective C++ (to be added in Automake 1.12.1) can be
simplified if we assume Autoconf version 2.65 or later (2.65 being the
version that introduced support for Objective C++). Since such an Autoconf
version is two and half years old now (and will likely be almost three
years old when Automake 1.13 gets released), requiring it is acceptable.
This will also simplify testing and maintenance of Automake, because we'll
need to test with fewer Autoconf version, and possibly rely on new Autoconf
features.
* NEWS (Version requirements): Automake 1.13 will require Autoconf
2.65 or later.
* configure.ac ($required_autoconf_version): Bump to 2.65.
* m4/init.m4 (AM_INIT_AUTOMAKE): Require Autoconf >= 2.65.
Assume AC_PROG_OBJCXX is unconditionally defined.
* m4/depout.m4: Adjust a comment about a nugget of defensive programming.
* t/ext.sh: Assume that AC_PROG_OBJCXX is unconditionally defined,
and that we are using Autoconf >= 2.65. Related simplifications.
* t/objc-megademo.sh: Likewise.
* t/objcxx-basic.sh: Likewise.
* t/objcxx-deps.sh: Likewise.
* t/objcxx-flags.sh: Likewise.
* t/objcxx-minidemo.sh: Likewise.
* t/nodep2.sh: Likewise.
* t/backcompat3.sh: Assume AC_INIT accepts an URL argument.
* t/depend5.sh: Adjust a comment.
* syntax-checks.mk (sc_test_names): Delete this check as now useless:
autoconf >= 2.65 (>= 2.63, actually) can handle arguments to AC_INIT
that contain or are m4 builtins or predefined macros.
(m4_builtin): Delete this now-useless variable as well, was used only
by the check above.
(syntax_check_rules): Update.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/objc-megademo.sh')
| -rwxr-xr-x | t/objc-megademo.sh | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/t/objc-megademo.sh b/t/objc-megademo.sh index bad2aeef8..0e0234172 100755 --- a/t/objc-megademo.sh +++ b/t/objc-megademo.sh @@ -24,8 +24,6 @@ required=libtoolize cat > configure.ac << 'END' AC_INIT([play], [1.3], [bug-automake@gnu.org]) -dnl Support for Object C++ was introduced only in Autoconf 2.65. -AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([play.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) @@ -86,13 +84,7 @@ END ## Run Autotools. libtoolize -if $ACLOCAL; then - : We have a modern enough autoconf, go ahead. -elif test $? -eq 63; then - skip_ "Object C++ support requires Autoconf 2.65 or later" -else - Exit 1 # Some other aclocal failure. -fi +$ACLOCAL $AUTOHEADER $AUTOCONF $AUTOMAKE --add-missing |