[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.13-7
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.13-728-g19379ba |
|
Date: |
Fri, 28 Dec 2012 21:35:38 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=19379bae87f4270d9f023b63d01a2107fb3de942
The branch, ng/master has been updated
via 19379bae87f4270d9f023b63d01a2107fb3de942 (commit)
via f72b86a9cde6adca97dff2094b33599b5ba0bf48 (commit)
via f083c5eb1b3a57d5d720551f3d07a67ac07a85e7 (commit)
via ff0c7f834207d83cb8a717a6b0250ad794c93e11 (commit)
via ad08bbfa4f9949e7e7987d280779f3edc0e0a2cb (commit)
via 35da6083f8c3be18b6109a28752fe2f9f14f6c12 (commit)
via 1c0c0581bb219030092b6760e0289a63b9c3be4f (commit)
via 7d989ddd3afc5e4fbf58290c94a6e0c311ccd15e (commit)
via 880595d0b4930c51f96da50f755f2f2f882fe5b4 (commit)
via 29d2a15114809dd3d4a7fcae4a8014f8335bee5f (commit)
via 7326c52ebc428f4f14bdc24df05b528827866fd6 (commit)
from 7801987fbd34c40d63fb249fa1796866d3b8baf6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 19379bae87f4270d9f023b63d01a2107fb3de942
Merge: 7801987 f72b86a
Author: Stefano Lattarini <address@hidden>
Date: Fri Dec 28 22:08:46 2012 +0100
Merge branch 'master' into ng/master
* master:
tests: remove stray uses of 'Exit', in favour of simple 'exit'
general: assume dot-starting file names are supported
Drop support for DJGPP, MS-DOS, Windows 95/98/ME
depcomp: remove support for SGI C/C++ compilers
tests: a test about warnings in category 'obsolete' was failing spuriously
ACLOCAL_AMFLAGS: fully deprecate, with warnings in the 'obsolete' category
compile: remove support for $(INCLUDES)
aclocal: allow third-party macros take precedence over automake ones
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
NEWS | 39 ++++++++++++
aclocal.in | 2 +-
automake.in | 12 ++++-
doc/automake-ng.texi | 64 +++++++++-----------
lib/depcomp | 35 -----------
lib/ylwrap | 17 +-----
syntax-checks.mk | 2 +-
t/aclocal-acdir.sh | 10 ++--
t/aclocal-amflags.sh | 15 ++++-
t/aclocal-deleted-header-aclocal-amflags.sh | 5 +-
t/aclocal-dirlist.sh | 10 +--
...local-m4-include-are-scanned-aclocal-amflags.sh | 1 +
t/aclocal-path-precedence.sh | 18 ++++--
t/ax/distcheck-hook-m4.am | 2 +
t/dist-missing-m4.sh | 5 +-
t/gettext-macros.sh | 3 +-
t/{primary2.sh => includes-no-more.sh} | 12 ++--
t/libtool-macros.sh | 5 +-
t/remake-deleted-m4-file.sh | 5 +-
t/remake-gnulib-add-acsubst.sh | 4 +-
t/remake-gnulib-add-header.sh | 4 +-
t/remake-gnulib-remove-header.sh | 4 +-
t/remake-moved-m4-file.sh | 5 +-
t/remake-renamed-m4-file.sh | 4 +-
t/remake-renamed-m4-macro-and-file.sh | 4 +-
t/remake-renamed-m4-macro.sh | 4 +-
t/warnings-obsolete-default.sh | 10 +---
27 files changed, 154 insertions(+), 147 deletions(-)
copy t/{primary2.sh => includes-no-more.sh} (75%)
diff --git a/NEWS b/NEWS
index bdafaed..be3ea37 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,42 @@
+New in 1.14:
+
+* Aclocal search path:
+
+ - Third-party m4 files located in the system-wide aclocal directory,
+ as well as in any directory listed in the ACLOCAL_PATH environment
+ variable, now take precedence over "built-in" Automake macros.
+ For example, assuming Automake is installed in the '/usr/local'
+ hierarchy, a definition of the AM_PROG_VALAC macro found in file
+ (say) '/usr/local/share/aclocal/my-vala.m4' should take precedence
+ over the same-named automake-provided macro, as defined in file
+ '/usr/local/share/aclocal-1.14/vala.m4'.
+
+* Obsolete and obsolescent features:
+
+ - Support for the long-obsolete $(INCLUDES) variable has been finally
+ removed, in favour of the modern equivalent $(AM_CPPFLAGS).
+
+ - Use of the special makefile variable 'ACLOCAL_AMFLAGS' is deprecated.
+ To specify locations of extra m4 files, the 'AC_CONFIG_MACRO_DIR' or
+ 'AC_CONFIG_MACRO_DIRS' (the latter introduced with autoconf 2.70)
+ should be used instead. And use of the '--install' aclocal option in
+ 'ACLOCAL_AMFLAGS' has proved to be a bad idea anyway -- see automake
+ bug#9037.
+
+* Removed support for obsolete platforms:
+
+ - Support for the SGI C/C++ compilers has been removed: these compilers
+ are only meant to run on IRIX, and that system has seen its last
+ release in 2006, and is expected to lose support from SGI in December
+ 2013; see <http://www.sgi.com/services/support/irix_mips_support.html>
+ for more information.
+
+ - Support for DJGPP on MS-DOS and/or Windows 95/98/ME has been removed.
+ Note that both Cygwin and MSYS/MinGW on modern Windows versions will
+ continue to be fully supported.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
New in 1.13:
* WARNING: Future backward-incompatibilities!
diff --git a/aclocal.in b/aclocal.in
index 653528a..859f71b 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -408,8 +408,8 @@ sub scan_m4_files ()
scan_m4_dirs (FT_USER, !$install, $user_includes[0]);
scan_m4_dirs (FT_USER, 1, @user_includes[1..$#user_includes]);
}
- scan_m4_dirs (FT_AUTOMAKE, 1, @automake_includes);
scan_m4_dirs (FT_SYSTEM, 1, @system_includes);
+ scan_m4_dirs (FT_AUTOMAKE, 1, @automake_includes);
# Construct a new function that does the searching. We use a
# function (instead of just evaluating $search in the loop) so that
diff --git a/automake.in b/automake.in
index 5820c51..7d431e9 100644
--- a/automake.in
+++ b/automake.in
@@ -831,7 +831,7 @@ register_language ('name' => 'asm',
'config_vars' => ['CCAS', 'CCASFLAGS'],
'flags' => ['CCASFLAGS'],
- # Users can set AM_CCASFLAGS to include, say, DEFS,
+ # Users can set AM_CCASFLAGS to include, say, $(DEFS),
# or anything else required. They can also set CCAS.
# Or simply use Preprocessed Assembler.
'compile' => '$(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)',
@@ -6643,6 +6643,16 @@ sub generate_makefile ($$)
}
}
+ # Catch some obsolete variables.
+ reject_var 'INCLUDES', "'INCLUDES' is the obsolete name for " .
+ "'AM_CPPFLAGS' (or '*_CPPFLAGS')";
+ if (my $amflags = var ('ACLOCAL_AMFLAGS'))
+ {
+ msg_var 'obsolete', $amflags,
+ "'ACLOCAL_AMFLAGS' is deprecated; use 'AC_CONFIG_MACRO_DIRS'"
+ . " in configure.ac instead";
+ }
+
# Some of these must do this after reading .am file.
define_variable ('subdir', INTERNAL, $relative_dir);
diff --git a/doc/automake-ng.texi b/doc/automake-ng.texi
index 7fb6cad..69d1a9c 100644
--- a/doc/automake-ng.texi
+++ b/doc/automake-ng.texi
@@ -3302,15 +3302,10 @@ way as it is for @command{automake} (@pxref{automake
Invocation}).
@cindex Macro search path
@cindex @command{aclocal} search path
-By default, @command{aclocal} searches for @file{.m4} files in the following
-directories, in this order:
+By default, @command{aclocal} searches for @file{.m4} files in the
+following directories, in this order:
@table @code
address@hidden @var{acdir-APIVERSION}
-This is where the @file{.m4} macros distributed with Automake itself
-are stored. @var{APIVERSION} depends on the Automake release used;
-for example, for Automake 1.11.x, @var{APIVERSION} = @code{1.11}.
-
@item @var{acdir}
This directory is intended for third party @file{.m4} files, and is
configured when @command{automake} itself is built. This is
@@ -3318,14 +3313,19 @@ configured when @command{automake} itself is built.
This is
expands to @address@hidden@}/share/aclocal/}. To find the compiled-in
value of @var{acdir}, use the @option{--print-ac-dir} option
(@pxref{aclocal Options}).
+
address@hidden @var{acdir-APIVERSION}
+This is where the @file{.m4} macros distributed with Automake itself
+are stored. @var{APIVERSION} depends on the Automake release used;
+for example, for Automake 1.11.x, @var{APIVERSION} = @code{1.11}.
@end table
As an example, suppose that @command{automake-1.11.2} was configured with
@address@hidden/usr/local}. Then, the search path would be:
@enumerate
address@hidden @file{/usr/local/share/aclocal-1.11.2/}
@item @file{/usr/local/share/aclocal/}
address@hidden @file{/usr/local/share/aclocal-1.11.2/}
@end enumerate
The paths for the @var{acdir} and @var{acdir-APIVERSION} directories can
@@ -3347,8 +3347,8 @@ Any extra directories specified using @option{-I} options
@enumerate
@item @file{/foo}
@item @file{/bar}
address@hidden @address@hidden
@item @var{acdir}
address@hidden @address@hidden
@end enumerate
@subsubheading Modifying the Macro Search Path: @file{dirlist}
@@ -3375,13 +3375,14 @@ and that @command{aclocal} was called with the @samp{-I
/foo -I /bar} options.
Then, the search path would be
@c @code looks better than @file here
address@hidden See test aclocal-dirlist.sh
@enumerate
@item @code{/foo}
@item @code{/bar}
address@hidden @address@hidden
@item @var{acdir}
@item @code{/test1}
@item @code{/test2}
address@hidden @address@hidden
@end enumerate
@noindent
@@ -3398,19 +3399,22 @@ If the @address@hidden option is used, then
directories are
@c @code looks better than @file here
address@hidden Keep in sync with aclocal-path-precedence.sh
@enumerate
address@hidden @code{/usr/share/aclocal-1.11/}
@item @code{/usr/share/aclocal/}
address@hidden @code{/usr/share/aclocal-1.11/}
@end enumerate
-However, suppose further that many packages have been manually
-installed on the system, with $prefix=/usr/local, as is typical. In
+However, suppose further that many packages have been manually installed
+on the system, with @address@hidden@}=/usr/local}, as is typical. In
that case, many of these ``extra'' @file{.m4} files are in
address@hidden/usr/local/share/aclocal}. The only way to force
address@hidden/usr/bin/aclocal} to find these ``extra'' @file{.m4} files is to
-always call @samp{aclocal -I /usr/local/share/aclocal}. This is
-inconvenient. With @file{dirlist}, one may create a file
address@hidden/usr/share/aclocal/dirlist} containing only the single line
address@hidden/usr/local/share/aclocal}. A way to force @file{/usr/bin/aclocal}
+to find these ``extra'' @file{.m4} files is to export @code{ACLOCAL_PATH}
+to @samp{/usr/local/share/aclocal}. This is a little inconvenient,
+since it requires either explicit user cooperation, or editing of the
+system global shell initialization file. With @file{dirlist}, one may
+create a file @file{/usr/share/aclocal/dirlist} containing only the
+single line
@example
/usr/local/share/aclocal
@@ -3419,20 +3423,18 @@ inconvenient. With @file{dirlist}, one may create a
file
Now, the ``default'' search path on the affected system is
@c @code looks better than @file here
address@hidden See test aclocal-dirlist.sh
@enumerate
address@hidden @code{/usr/share/aclocal-1.11/}
@item @code{/usr/share/aclocal/}
@item @code{/usr/local/share/aclocal/}
address@hidden @code{/usr/share/aclocal-1.11/}
@end enumerate
-without the need for @option{-I} options; @option{-I} options can be reserved
-for project-specific needs (@file{my-source-dir/m4/}), rather than
-using it to work around local system-dependent tool installation
-directories.
+without the need of any explicit @code{ACLOCAL_PATH} setting.
Similarly, @file{dirlist} can be handy if you have installed a local
-copy of Automake in your account and want @command{aclocal} to look for
-macros installed at other places on the system.
+copy of Automake in your account and want @command{aclocal} to look
+for macros installed at other places on the system.
@anchor{ACLOCAL_PATH}
@subsubheading Modifying the Macro Search Path: @file{ACLOCAL_PATH}
@@ -3460,16 +3462,6 @@ Conversely to @file{dirlist}, @env{ACLOCAL_PATH} is
useful if you are
using a global copy of Automake and want @command{aclocal} to look for
macros somewhere under your home directory.
address@hidden Planned future incompatibilities
-
-The order in which the directories in the macro search path are currently
-looked up is confusing and/or suboptimal in various aspects, and is
-probably going to be changed in the future Automake release. In
-particular, directories in @env{ACLOCAL_PATH} and @address@hidden
-might end up taking precedence over @address@hidden, and
-directories in @address@hidden/dirlist} might end up taking precedence
-over @address@hidden @emph{This is a possible future incompatibility!}
-
@node Extending aclocal
@subsection Writing your own aclocal macros
@@ -3497,7 +3489,7 @@ aclocal_DATA = mymacro.m4 myothermacro.m4
@noindent
Please do use @file{$(datadir)/aclocal}, and not something based on
the result of @samp{aclocal --print-ac-dir} (@pxref{Hard-Coded Install
-Paths}, for arguments). It might also be helpful to suggest to
+Paths}, for rationale). It might also be helpful to suggest to
the user to add the @file{$(datadir)/aclocal} directory to his
@env{ACLOCAL_PATH} variable (@pxref{ACLOCAL_PATH}) so that
@command{aclocal} will find the @file{.m4} files installed by your
diff --git a/lib/depcomp b/lib/depcomp
index f6d7ed0..96a7ae2 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -250,41 +250,6 @@ hp)
exit 1
;;
-sgi)
- if test "$libtool" = yes; then
- "$@" "-Wp,-MDupdate,$tmpdepfile"
- else
- "$@" -MDupdate "$tmpdepfile"
- fi
- stat=$?
- if test $stat -ne 0; then
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
-
- if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
- echo "$object : \\" > "$depfile"
- # Clip off the initial element (the dependent). Don't try to be
- # clever and replace this with sed code, as IRIX sed won't handle
- # lines with more than a fixed number of characters (4096 in
- # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
- # the IRIX cc adds comments like '#:fec' to the end of the
- # dependency line.
- tr ' ' "$nl" < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
- | tr "$nl" ' ' >> "$depfile"
- echo >> "$depfile"
- # The second pass generates a dummy entry for each header file.
- tr ' ' "$nl" < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
- >> "$depfile"
- else
- make_dummy_depfile
- fi
- rm -f "$tmpdepfile"
- ;;
-
xlc)
# This case exists only to let depend.m4 do its work. It works by
# looking at the text of this script. This case will never be run,
diff --git a/lib/ylwrap b/lib/ylwrap
index c3220a1..8682293 100755
--- a/lib/ylwrap
+++ b/lib/ylwrap
@@ -1,7 +1,7 @@
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
-scriptversion=2012-12-21.17; # UTC
+scriptversion=2012-12-28.20; # UTC
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
@@ -111,14 +111,6 @@ case "$input" in
esac
input_rx=`get_dirname "$input" | quote_for_sed`
-# Since DOS filename conventions don't allow two dots,
-# the DOS version of Bison writes out y_tab.c instead of y.tab.c
-# and y_tab.h instead of y.tab.h. Test to see if this is the case.
-y_tab_nodot=false
-if test -f y_tab.c || test -f y_tab.h; then
- y_tab_nodot=true
-fi
-
# The parser itself, the first file, is the destination of the .y.c
# rule in the Makefile.
parser=$1
@@ -138,13 +130,6 @@ while test "$#" -ne 0; do
break
fi
from=$1
- # Handle y_tab.c and y_tab.h output by DOS
- if $y_tab_nodot; then
- case $from in
- "y.tab.c") from=y_tab.c;;
- "y.tab.h") from=y_tab.h;;
- esac
- fi
shift
to=$1
shift
diff --git a/syntax-checks.mk b/syntax-checks.mk
index d0a54f3..eaae627 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -90,7 +90,7 @@ sc_tabs_in_texi \
sc_at_in_texi
## These check avoids accidental configure substitutions in the source.
-## There are exactly 8 lines that should be modified from automake.in to
+## There are exactly 7 lines that should be modified from automake.in to
## automake, and 9 lines that should be modified from aclocal.in to
## aclocal.
automake_diff_no = 7
diff --git a/t/aclocal-acdir.sh b/t/aclocal-acdir.sh
index 944604b..8b3f244 100755
--- a/t/aclocal-acdir.sh
+++ b/t/aclocal-acdir.sh
@@ -15,8 +15,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test aclocal's '--automake-acdir' and '--system-acdir' options. Also
-# check that stuff in the automake acdir takes precedence over stuff in
-# the system acdir.
+# check that stuff in the system acdir takes precedence over stuff in
+# the automake acdir.
. test-init.sh
@@ -65,14 +65,14 @@ $FGREP 'my--macro' configure
rm -rf autom4te*.cache
-# Stuff in automake acdir takes precedence over stuff in system acdir.
+# Stuff in system acdir takes precedence over stuff in automake acdir.
cat > am/bar.m4 <<'END'
AC_DEFUN([MY_MACRO], [am--macro])
END
$ACLOCAL --automake-acdir am --system-acdir sys
$AUTOCONF --force
$FGREP 'fake--init--automake' configure
-$FGREP 'am--macro' configure
-$FGREP 'my--macro' configure && exit 1 # Just to be sure.
+$FGREP 'my--macro' configure
+$FGREP 'am--macro' configure && exit 1
:
diff --git a/t/aclocal-amflags.sh b/t/aclocal-amflags.sh
index 49bcf5f..69bce32 100755
--- a/t/aclocal-amflags.sh
+++ b/t/aclocal-amflags.sh
@@ -15,8 +15,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Check that the obsolescent idiom of setting $(ACLOCAL_AMFLAGS) in
-# Makefile.am still works. Remove this test once support for this
-# obsolescent idiom is removed.
+# Makefile.am is warned against, but still works. Remove this test
+# once support for this obsolescent idiom is removed.
. test-init.sh
@@ -45,7 +45,16 @@ $ACLOCAL -I m4_1 >output 2>&1 || { cat output; exit 1; }
cat output
grep 'found macro' output && exit 1 # Sanity check.
$AUTOCONF
-$AUTOMAKE
+
+for opts in '' '-Wnone -Wobsolete'; do
+ AUTOMAKE_fails $opts
+ grep "Makefile\.am:.*'ACLOCAL_AMFLAGS' is deprecated" stderr
+ grep "Makefile\.am:.*'AC_CONFIG_MACRO_DIRS'.*configure\.ac.*instead" stderr
+done
+
+echo AUTOMAKE_OPTIONS = -Wall -Wno-obsolete >> Makefile.am
+cat Makefile.am # For debugging.
+$AUTOMAKE -Werror
./configure
test -f foo
diff --git a/t/aclocal-deleted-header-aclocal-amflags.sh
b/t/aclocal-deleted-header-aclocal-amflags.sh
index ea47635..8f11ebd 100755
--- a/t/aclocal-deleted-header-aclocal-amflags.sh
+++ b/t/aclocal-deleted-header-aclocal-amflags.sh
@@ -22,7 +22,10 @@
. test-init.sh
-cat >>configure.ac <<EOF
+cat > configure.ac <<EOF
+AC_INIT([$me], [1.3])
+AM_INIT_AUTOMAKE([-Wno-obsolete])
+AC_CONFIG_FILES([Makefile])
FOO
AC_OUTPUT
EOF
diff --git a/t/aclocal-dirlist.sh b/t/aclocal-dirlist.sh
index 2dc9038..6daf6a5 100755
--- a/t/aclocal-dirlist.sh
+++ b/t/aclocal-dirlist.sh
@@ -35,9 +35,9 @@ module=[$1]
AC_SUBST(module)])
END
-cat >dirlist-test/init.m4 <<EOF
-AC_DEFUN([AM_INIT_AUTOMAKE], [I should not be included])
-EOF
+cat >dirlist-test/init.m4 <<'END'
+AC_DEFUN([AM_INIT_AUTOMAKE], [Hey, I should be included, really!])
+END
$ACLOCAL --system-acdir acdir
$AUTOCONF
@@ -49,8 +49,6 @@ grep m4_include aclocal.m4 && exit 1
grep 'GUILE-VERSION' configure
-# This bug can occur only when we do a VPATH build of Automake
-# but it's OK because VPATH builds are done by 'make distcheck'.
-grep 'I should not be included' configure && exit 1
+$FGREP 'Hey, I should be included, really!' configure
:
diff --git a/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
b/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
index 31a0540..c7b2392 100755
--- a/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
+++ b/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
@@ -46,6 +46,7 @@ echo 'AC_DEFUN([ANOTHER_MACRO])' >defs/f.m4
cat >>Makefile.am<<\EOF
ACLOCAL_AMFLAGS = -I defs
+AUTOMAKE_OPTIONS = -Wno-obsolete
testdist1: distdir
test -f $(distdir)/acinclude.m4
test -f $(distdir)/a.m4
diff --git a/t/aclocal-path-precedence.sh b/t/aclocal-path-precedence.sh
index 0545231..9aee98a 100755
--- a/t/aclocal-path-precedence.sh
+++ b/t/aclocal-path-precedence.sh
@@ -46,10 +46,16 @@ cat > mdir3/bar.m4 << 'END'
AC_DEFUN([BAR_MACRO], [::pass-bar::])
END
-cat > mdir2/quux.m4 << 'END'
-AC_DEFUN([AM_INIT_AUTOMAKE], [::fail-init::])
-AC_DEFUN([AC_PROG_LIBTOOL], [::pass-libtool::])
-AC_DEFUN([AM_GNU_GETTEXT], [::pass-gettext::])
+cat > mdir2/quux-a.m4 << 'END'
+AC_DEFUN([AM_INIT_AUTOMAKE], [::pass-am-init::])
+END
+
+cat > mdir2/quux-b.m4 << 'END'
+AC_DEFUN([AC_PROG_LIBTOOL], [::pass-libtool::])
+END
+
+cat > mdir2/quux-c.m4 << 'END'
+AC_DEFUN([AM_GNU_GETTEXT], [::pass-gettext::])
END
cat > sysdir/libtool.m4 << 'END'
@@ -81,9 +87,9 @@ $FGREP '::pass-bar::' configure
$FGREP '::pass-gettext::' configure
$FGREP '::pass-libtool::' configure
-# Directories in ACLOCAL_PATH shouldn't take precedence over the internal
+# Directories in ACLOCAL_PATH shoul take precedence over the internal
# automake acdir (typically '${prefix}/share/aclocal-${APIVERSION}').
-$FGREP 'am__api_version' configure
+$FGREP '::pass-am-init::' configure
# A final sanity check.
$FGREP '::fail' configure && exit 1
diff --git a/t/ax/distcheck-hook-m4.am b/t/ax/distcheck-hook-m4.am
index 30b8760..a65d269 100644
--- a/t/ax/distcheck-hook-m4.am
+++ b/t/ax/distcheck-hook-m4.am
@@ -15,6 +15,8 @@
## You should have received a copy of the GNU General Public License
## along with this program. If not, see <http://www.gnu.org/licenses/>.
+AUTOMAKE_OPTIONS = -Wno-obsolete
+
distcheck-hook:
@fatal () { echo "$@: $$*" >&2; exit 1; }; \
cd $(distdir) && chmod u+w . && mkdir _m4 \
diff --git a/t/dist-missing-m4.sh b/t/dist-missing-m4.sh
index 367c11a..dbda585 100755
--- a/t/dist-missing-m4.sh
+++ b/t/dist-missing-m4.sh
@@ -23,6 +23,7 @@
. test-init.sh
cat >> configure.ac <<'END'
+AC_CONFIG_MACRO_DIR([m4])
m4_pattern_forbid([^MY_])
MY_FOOBAR || exit 1
MY_ZARDOZ || exit 1
@@ -33,9 +34,9 @@ mkdir m4
echo 'AC_DEFUN([MY_FOOBAR], [:])' > m4/foobar.m4
echo 'AC_DEFUN([MY_ZARDOZ], [:])' > m4/zardoz.m4
-echo 'ACLOCAL_AMFLAGS = -I m4' > Makefile.am
+: > Makefile.am
-$ACLOCAL -I m4
+$ACLOCAL
$AUTOCONF
$AUTOMAKE
diff --git a/t/gettext-macros.sh b/t/gettext-macros.sh
index 9c64e8b..f14df38 100755
--- a/t/gettext-macros.sh
+++ b/t/gettext-macros.sh
@@ -29,7 +29,8 @@ echo "# Automatically generated by $me." > get.sh
echo : >> get.sh
# The 'gettextize' and 'autopoint' scripts will look into Makefile.am.
-echo ACLOCAL_AMFLAGS = -I m4 > Makefile.am
+echo AUTOMAKE_OPTIONS = -Wno-obsolete > Makefile.am
+echo ACLOCAL_AMFLAGS = -I m4 >> Makefile.am
# Prefer autopoint to gettextize, since the more modern versions of the
# latter might unconditionally require user interaction to complete;
diff --git a/t/primary2.sh b/t/includes-no-more.sh
similarity index 75%
copy from t/primary2.sh
copy to t/includes-no-more.sh
index c7437fe..eceaed6 100755
--- a/t/primary2.sh
+++ b/t/includes-no-more.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# Copyright (C) 2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,19 +14,19 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Test to make sure errors in am_install_var work.
+# Support for $(INCLUDES) has been removed.
. test-init.sh
echo AC_PROG_CC >> configure.ac
cat > Makefile.am << 'END'
-bin_PROGRAMS = @programs@
-EXTRA_PROGRAMS = joe @more@
+bin_PROGRAMS = foo
+INCLUDES = -DFOO
END
$ACLOCAL
-AUTOMAKE_fails
-grep 'EXTRA_PROGRAMS.*configure substitution' stderr
+AUTOMAKE_fails -Wnone -Wno-error
+grep "^Makefile\\.am:2:.* 'INCLUDES'.* obsolete.* 'AM_CPPFLAGS'" stderr
:
diff --git a/t/libtool-macros.sh b/t/libtool-macros.sh
index c50777b..ec84682 100755
--- a/t/libtool-macros.sh
+++ b/t/libtool-macros.sh
@@ -23,8 +23,7 @@
echo "# Automatically generated by $me." > get.sh
echo : >> get.sh
-# The 'libtoolize' script will look into Makefile.am.
-echo ACLOCAL_AMFLAGS = -I m4 > Makefile.am
+echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
if libtoolize --copy --install && test -f m4/libtool.m4; then
echo "ACLOCAL_PATH='$(pwd)/m4':\$ACLOCAL_PATH" >> get.sh
@@ -37,7 +36,7 @@ else
mkdir m4
echo AC_PROG_LIBTOOL >> configure.ac
# See below for an explanation about the use the of '-Wno-syntax'.
- if $ACLOCAL -Wno-syntax -I m4 --install && test -f m4/libtool.m4; then
+ if $ACLOCAL -Wno-syntax --install && test -f m4/libtool.m4; then
: # Libtool macros already accessible by default.
else
echo "skip_all_ \"couldn't find or get libtool macros\"" >> get.sh
diff --git a/t/remake-deleted-m4-file.sh b/t/remake-deleted-m4-file.sh
index 6eac545..2a972fc 100755
--- a/t/remake-deleted-m4-file.sh
+++ b/t/remake-deleted-m4-file.sh
@@ -25,10 +25,11 @@
cat >> configure.ac <<'END'
FOO_MACRO
AC_OUTPUT
+dnl Deliberately put this late, for better coverage.
+AC_CONFIG_MACRO_DIR([m4])
END
cat > Makefile.am <<'END'
-ACLOCAL_AMFLAGS = -I m4
.PHONY: test
test:
test '$(the_answer)' -eq 42
@@ -46,7 +47,7 @@ cat > m4/bar.m4 <<END
AC_DEFUN([BAR_MACRO], [$macro_value])
END
-$ACLOCAL -I m4
+$ACLOCAL
$AUTOCONF
$AUTOMAKE
diff --git a/t/remake-gnulib-add-acsubst.sh b/t/remake-gnulib-add-acsubst.sh
index 6464b55..f8760c8 100755
--- a/t/remake-gnulib-add-acsubst.sh
+++ b/t/remake-gnulib-add-acsubst.sh
@@ -26,12 +26,12 @@ required=cc
cat >> configure.ac <<'END'
AC_PROG_CC
+AC_CONFIG_MACRO_DIRS([m4])
MY_MACROS
AC_OUTPUT
END
cat > Makefile.am <<'END'
-ACLOCAL_AMFLAGS = -I m4
noinst_PROGRAMS = foo
foo_SOURCES = foo.c
BUILT_SOURCES = foo.h
@@ -70,7 +70,7 @@ int main (void) { return 0; }
typedef int checkfoo[1 - 2 * (foo != 42)];
END
-$ACLOCAL -I m4
+$ACLOCAL
$AUTOCONF
$AUTOMAKE
diff --git a/t/remake-gnulib-add-header.sh b/t/remake-gnulib-add-header.sh
index 609e5ea..70a7984 100755
--- a/t/remake-gnulib-add-header.sh
+++ b/t/remake-gnulib-add-header.sh
@@ -25,6 +25,7 @@ required=cc
. test-init.sh
cat >> configure.ac <<'END'
+AC_CONFIG_MACRO_DIR([.])
AC_CONFIG_HEADERS([config.h])
AC_PROG_CC
MY_MACROS
@@ -32,7 +33,6 @@ AC_OUTPUT
END
cat > Makefile.am <<'END'
-ACLOCAL_AMFLAGS = -I .
noinst_PROGRAMS = foo
foo_SOURCES = foo.c
BUILT_SOURCES = $(STDIO_H)
@@ -80,7 +80,7 @@ FILE *f;
int main () { return 0; }
END
-$ACLOCAL -I .
+$ACLOCAL
$AUTOHEADER
$AUTOMAKE
$AUTOCONF
diff --git a/t/remake-gnulib-remove-header.sh b/t/remake-gnulib-remove-header.sh
index 2dbe66a..7bd29de 100755
--- a/t/remake-gnulib-remove-header.sh
+++ b/t/remake-gnulib-remove-header.sh
@@ -26,6 +26,7 @@ required=cc
. test-init.sh
cat >> configure.ac <<'END'
+AC_CONFIG_MACRO_DIR([.])
AC_CONFIG_HEADERS([config.h])
AC_PROG_CC
MY_MACROS
@@ -33,7 +34,6 @@ AC_OUTPUT
END
cat > Makefile.am <<'END'
-ACLOCAL_AMFLAGS = -I .
noinst_PROGRAMS = foo
foo_SOURCES = foo.c
BUILT_SOURCES = $(STDIO_H)
@@ -80,7 +80,7 @@ FILE *f;
int main () { return 0; }
END
-$ACLOCAL -I .
+$ACLOCAL
$AUTOHEADER
$AUTOMAKE
$AUTOCONF
diff --git a/t/remake-moved-m4-file.sh b/t/remake-moved-m4-file.sh
index 0a20b5e..56578c7 100755
--- a/t/remake-moved-m4-file.sh
+++ b/t/remake-moved-m4-file.sh
@@ -21,11 +21,12 @@
cat >> configure.ac <<'END'
MY_MACRO
+AC_CONFIG_MACRO_DIRS([d1])
+AC_CONFIG_MACRO_DIRS([d2 d3])
AC_OUTPUT
END
cat > Makefile.am <<'END'
-ACLOCAL_AMFLAGS = -I d1 -I d2 -I d3
.PHONY: test
test:
test '$(the_answer)' -eq 42
@@ -41,7 +42,7 @@ cat > d1/foo.m4 <<'END'
AC_DEFUN([FOO], [the_answer=42; AC_SUBST([the_answer])])
END
-$ACLOCAL -I d1
+$ACLOCAL
$AUTOCONF
$AUTOMAKE
diff --git a/t/remake-renamed-m4-file.sh b/t/remake-renamed-m4-file.sh
index fc1f4fc..0dba207 100755
--- a/t/remake-renamed-m4-file.sh
+++ b/t/remake-renamed-m4-file.sh
@@ -19,12 +19,12 @@
. test-init.sh
cat >> configure.ac <<'END'
+AC_CONFIG_MACRO_DIR([m4])
MY_MACRO
AC_OUTPUT
END
cat > Makefile.am <<'END'
-ACLOCAL_AMFLAGS = -I m4
.PHONY: test
test:
test '$(the_answer)' -eq 42
@@ -40,7 +40,7 @@ cat > m4/foo.m4 <<'END'
AC_DEFUN([FOO], [the_answer=42; AC_SUBST([the_answer])])
END
-$ACLOCAL -I m4
+$ACLOCAL
$AUTOCONF
$AUTOMAKE
diff --git a/t/remake-renamed-m4-macro-and-file.sh
b/t/remake-renamed-m4-macro-and-file.sh
index 7d6ad44..51e89b2 100755
--- a/t/remake-renamed-m4-macro-and-file.sh
+++ b/t/remake-renamed-m4-macro-and-file.sh
@@ -21,12 +21,12 @@
. test-init.sh
cat >> configure.ac <<'END'
+AC_CONFIG_MACRO_DIR([m4])
MY_MACRO
AC_OUTPUT
END
cat > Makefile.am <<'END'
-ACLOCAL_AMFLAGS = -I m4
.PHONY: test
test:
test '$(the_answer)' -eq 42
@@ -42,7 +42,7 @@ cat > m4/foo.m4 <<'END'
AC_DEFUN([FOO_MACRO], [the_answer=42; AC_SUBST([the_answer])])
END
-$ACLOCAL -I m4
+$ACLOCAL
$AUTOCONF
$AUTOMAKE
diff --git a/t/remake-renamed-m4-macro.sh b/t/remake-renamed-m4-macro.sh
index 4acee06..855c17f 100755
--- a/t/remake-renamed-m4-macro.sh
+++ b/t/remake-renamed-m4-macro.sh
@@ -20,12 +20,12 @@
. test-init.sh
cat >> configure.ac <<'END'
+AC_CONFIG_MACRO_DIR([m4])
MY_MACRO
AC_OUTPUT
END
cat > Makefile.am <<'END'
-ACLOCAL_AMFLAGS = -I m4
.PHONY: test
test:
test '$(the_answer)' -eq 42
@@ -42,7 +42,7 @@ AC_DEFUN([FOO_1], [the_answer=42
AC_SUBST([the_answer])])
END
-$ACLOCAL -I m4
+$ACLOCAL
$AUTOCONF
$AUTOMAKE
diff --git a/t/warnings-obsolete-default.sh b/t/warnings-obsolete-default.sh
index 7b16106..ac3a27d 100755
--- a/t/warnings-obsolete-default.sh
+++ b/t/warnings-obsolete-default.sh
@@ -22,17 +22,11 @@
# We want (almost) complete control over automake options.
AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror"
-cat > configure.ac <<'END'
-AC_INIT
-AM_INIT_AUTOMAKE([foo], [1.0])
-AC_CONFIG_FILES([Makefile])
-END
-
-: > Makefile.am
+echo ACLOCAL_AMFLAGS = > Makefile.am
$ACLOCAL
AUTOMAKE_fails
-grep '^configure\.ac:2:.*AM_INIT_AUTOMAKE.*arguments.*deprecated' stderr
+grep '^Makefile\.am:1:.*ACLOCAL_AMFLAGS.*deprecated' stderr
# Check that we can override warnings about obsolete stuff.
$AUTOMAKE -Wno-obsolete
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.13-728-g19379ba,
Stefano Lattarini <=