[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.13.1-10
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.13.1-102-g84d77cd |
|
Date: |
Sat, 12 Jan 2013 13:07:54 +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=84d77cd6e35f66a6bfd5b41a39bb8c2a4f909b6f
The branch, master has been updated
via 84d77cd6e35f66a6bfd5b41a39bb8c2a4f909b6f (commit)
via 1e44f8532f6b7d9d4c59efdb8e2850bc212260af (commit)
via 7746e5284767b9459e5ab3dc7eef4da63d68f93a (commit)
via 30af9050ea11ca27a2224c5cb31612f614965efb (commit)
via 182626687f2640609f8eb28ad1b04b078342f2c7 (commit)
via d353dbc3f01357e9bfce59d1720a8cb2498d12bd (commit)
via a9966b04d38577a76156ce16828bce874b582874 (commit)
via b8e238a757e692ef1849035fbc69045807f3fe54 (commit)
via fba16588f89f3a7d8a24034718e5f50204b2b0d8 (commit)
via 9cb18f18a756e7e6b7aaaaa5deaa7fd677e9a902 (commit)
via 34001a987a6defdb70f6f3c17cce9d9c665fe6e8 (commit)
via 1ab8fb6d0e8497c0b86a1453b901dda29ba9d9f6 (commit)
via b670a66a6ac1ee8ef25dc48a26e477812c2dbacf (commit)
via 10790d08f071a91160bbaeabab7fd8a8d23e5a55 (commit)
via 23f19aede924dee8ed0150df5f9efa3faf2ad145 (commit)
via dbe3eea4d5b65f998c57a571c034c6044f2bd1e2 (commit)
via 0168562049b471e432863c4570da53995fb92f2d (commit)
via 38bb5c65db4bfbfa9fa477c57fd2efe6f1f15a46 (commit)
via 27fc8979d004884cf9ce246f8d21d546b18e3003 (commit)
via ca307a408e036aab9eaf086cc2792929419ede1b (commit)
via 801cbef2d8a49af4c2e6f5a23b641170d0a1136b (commit)
via d7aef9bd0bb8df6f2acbfbae02798aa81d95370f (commit)
via 7138cc5eefae4ab5264cacfef5937a9ab235c238 (commit)
via ad2e3170ac4d5fc407038ce07916b3d70f739b3a (commit)
via 8f06bfba71ee217263a0cff050ac23b698b79807 (commit)
via a52e9de01897ff994fcfb49eb019a6c23a4c92e8 (commit)
via 94d8c69f1c350de94445734de7b5dce7b5673909 (commit)
via 6b31158c5930ef8ba357e07d28ca56ff6104278e (commit)
from bfd7cc5a7e2f4dbfa9b6c6188029b6fe345eba81 (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 84d77cd6e35f66a6bfd5b41a39bb8c2a4f909b6f
Merge: 9cb18f1 1e44f85
Author: Stefano Lattarini <address@hidden>
Date: Sat Jan 12 13:54:43 2013 +0100
Merge branch 'maint'
* maint:
tests: remove most uses of the AM_PROG_CC_C_O obsolete macro
coverage: obsolete macro AM_PROG_CC_C_O should cause no warning nor errors
INSTALL: update copyright years
ithreads: use runtime (not configure time) detection of perl threads
copyright: add few missing copyright notices
maint: files in PLANS are to be exempted from copyright notice
maint: consistently honor the UPDATE_COPYRIGHT_YEAR environment variable
copyright: update some copyright years
Signed-off-by: Stefano Lattarini <address@hidden>
commit 9cb18f18a756e7e6b7aaaaa5deaa7fd677e9a902
Merge: bfd7cc5 34001a9
Author: Stefano Lattarini <address@hidden>
Date: Fri Jan 11 21:53:19 2013 +0100
Merge branch 'maint'
* maint:
compile: use 'compile' script when "-c -o" is used with losing compilers
HACKING: suggest more checks before releasing
tests: can fake a compiler not grasping "-c -o" -- globally in all tests
sync: update files from upstream with "make fetch"
typofix: in comments in GNUmakefile
Rename 'maint/' -> 'maintainer/', for Git's sake
HACKING: minor typofix
HACKING: bug-tracker, the PLANS directory, and how to plan "big" changes
HACKING: rewindable branches should live in the 'experimental/*' namespace
HACKING: fixlets about git branch rewinding policy
HACKING: commit messages are not to follow GCS ChangeLog rules too
strongly
HACKING: "detailed explanation" in commit messages is almost mandatory
HACKING: we use "merge --log" even when merging master
HACKING: typofix
depend2.am: fix comments on verbosity of compilation rules
depend2.am: improve comments a little
plans: automake 1.14 is to assume "rm -f" with no args is OK
plans: we want to active subdir-objects unconditionally in automake 1.14
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 +
GNUmakefile | 6 +-
HACKING | 54 ++++++++----
INSTALL | 2 +-
Makefile.am | 34 ++++++--
NEWS | 26 ++++++
PLANS/rm-f-without-args.txt | 40 +++++++++
PLANS/subdir-objects.txt | 67 ++++++++++++++
automake.in | 47 ----------
bootstrap.sh | 4 +-
configure.ac | 28 +------
doc/automake.texi | 38 ++++++--
lib/Automake/Config.in | 9 ++-
lib/INSTALL | 2 +-
lib/am/depend2.am | 32 +------
lib/config.guess | 4 +-
lib/config.sub | 9 +-
lib/gendocs_template | 2 +-
lib/gitlog-to-changelog | 2 +-
lib/gnupload | 2 +-
lib/texinfo.tex | 7 +-
lib/update-copyright | 6 +-
m4/init.m4 | 45 ++++++++++
m4/minuso.m4 | 27 ++----
maint/am-xft | 3 -
maint/rename-tests | 52 -----------
{maint => maintainer}/am-ft | 16 ++++
t/pm/Version2.pl => maintainer/am-xft | 16 ++--
{maint => maintainer}/maint.mk | 11 ++-
maintainer/rename-tests | 67 ++++++++++++++
{maint => maintainer}/syntax-checks.mk | 0
t/acsubst2.sh | 1 -
t/add-missing.tap | 9 ++-
t/am-prog-cc-c-o.sh | 91 ++++++++++++++++++++
t/ax/am-test-lib.sh | 2 +-
t/{includes-no-more.sh => ax/cc-no-c-o.in} | 25 +++---
t/ax/depcomp.sh | 1 -
t/c-demo.sh | 1 -
t/ccnoco.sh | 25 +-----
t/ccnoco2.sh | 55 ------------
t/ccnoco3.sh | 22 +-----
t/ccnoco4.sh | 33 ++------
t/check8.sh | 1 -
t/compile4.sh | 1 -
t/cond11.sh | 1 -
t/cxx-lt-demo.sh | 6 +-
t/depcomp8a.sh | 6 +-
t/depcomp8b.sh | 5 +-
t/dist-auxdir-many-subdirs.sh | 1 +
t/distcom2.sh | 5 +-
t/dollarvar2.sh | 11 +--
t/extra-portability.sh | 13 ++--
t/instdir-ltlib.sh | 1 -
t/instdir-prog.sh | 1 -
t/lex-line.sh | 1 -
t/lex-subobj-nodep.sh | 1 -
t/lex5.sh | 1 -
t/libobj19.sh | 2 -
t/libtool9.sh | 1 -
t/list-of-tests.mk | 4 +-
t/per-target-flags.sh | 8 --
t/pr224.sh | 1 -
t/pr401.sh | 3 +-
t/pr401b.sh | 3 +-
t/pr401c.sh | 3 +-
t/repeated-options.sh | 3 +-
...install-no-mkdir.sh => self-check-cc-no-c-o.sh} | 25 +++---
t/silent-c.sh | 1 -
t/silent-lex.sh | 1 -
t/silent-lt.sh | 1 -
t/silent-many-languages.sh | 1 -
t/silent-nested-vars.sh | 1 -
t/silent-yacc.sh | 2 +-
t/specflg-dummy.sh | 1 -
t/specflg6.sh | 3 -
t/specflg7.sh | 1 -
t/specflg8.sh | 1 -
t/specflg9.sh | 1 -
t/subobj-clean-lt-pr10697.sh | 1 -
t/subobj-clean-pr10697.sh | 1 -
t/subobj.sh | 8 +-
t/subobj11a.sh | 1 -
t/subobj11b.sh | 5 +-
t/subobj11c.sh | 5 +-
t/subobj4.sh | 2 -
t/subobj5.sh | 1 -
t/subobj6.sh | 2 +-
t/subobj7.sh | 1 -
t/subobj8.sh | 1 -
t/suffix-custom-subobj-and-specflg.sh | 1 -
t/target-cflags.sh | 1 -
t/txinfo-builddir.sh | 2 +-
t/vala-libs.sh | 1 -
t/vala-mix.sh | 1 -
t/vala-non-recursive-setup.sh | 1 -
t/vala-per-target-flags.sh | 1 -
t/vala-recursive-setup.sh | 1 -
t/vala-vapi.sh | 1 -
t/yacc-dist-nobuild-subdir.sh | 1 -
t/yacc-grepping2.sh | 1 -
t/yacc-line.sh | 1 -
t/yacc-subdir.sh | 1 -
102 files changed, 583 insertions(+), 506 deletions(-)
create mode 100644 PLANS/rm-f-without-args.txt
create mode 100644 PLANS/subdir-objects.txt
delete mode 100755 maint/am-xft
delete mode 100755 maint/rename-tests
rename {maint => maintainer}/am-ft (79%)
copy t/pm/Version2.pl => maintainer/am-xft (79%)
mode change 100644 => 100755
rename {maint => maintainer}/maint.mk (97%)
create mode 100755 maintainer/rename-tests
rename {maint => maintainer}/syntax-checks.mk (100%)
create mode 100755 t/am-prog-cc-c-o.sh
copy t/{includes-no-more.sh => ax/cc-no-c-o.in} (66%)
mode change 100755 => 100644
delete mode 100755 t/ccnoco2.sh
copy t/{aclocal-no-install-no-mkdir.sh => self-check-cc-no-c-o.sh} (59%)
diff --git a/.gitignore b/.gitignore
index a32310e..4b509d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,7 @@
/doc/amhello/config.h.in~
/doc/amhello/configure
/doc/amhello/depcomp
+/doc/amhello/compile
/doc/amhello/install-sh
/doc/amhello/missing
/doc/web-manual
@@ -42,6 +43,7 @@
/t/wrap/automake-1.*
/t/ax/test-defs.sh
/t/ax/shell-no-trail-bslash
+/t/ax/cc-no-c-o
/t/testsuite-part.am
/t/*-w.tap
/t/*-w.sh
diff --git a/GNUmakefile b/GNUmakefile
index d6baaaa..52c2002 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -25,8 +25,8 @@ ifeq ($(wildcard Makefile),)
$(error Fatal Error)
endif
include ./Makefile
-include $(srcdir)/maint/maint.mk
-include $(srcdir)/maint/syntax-checks.mk
+include $(srcdir)/maintainer/maint.mk
+include $(srcdir)/maintainer/syntax-checks.mk
else # ! bootstrap in $(MAKECMDGOALS)
@@ -50,7 +50,7 @@ export BOOTSTRAP_SHELL
# kick in, because the tree might be in an inconsistent state (e.g.,
# we have just switched from 'maint' to 'master', and have the built
# 'automake' script left from 'maint', but the files 'lib/am/*.am'
-# are from 'master': if 'automake' gets run and used those files --
+# are from 'master': if 'automake' gets run and uses those files --
# boom!).
ifdef config-status # Bootstrap from an already-configured tree.
diff --git a/HACKING b/HACKING
index c70143e..8f51ff4 100644
--- a/HACKING
+++ b/HACKING
@@ -14,7 +14,7 @@
* If you incorporate a change from somebody on the net:
First, if it is a large change, you must make sure they have signed the
appropriate paperwork.
- Second, be sure to add their name and email address to THANKS
+ Second, be sure to add their name and email address to THANKS.
* If a change fixes a test, mention the test in the commit message.
If a change fixes a bug registered in the Automake debbugs tracker,
@@ -38,6 +38,16 @@
* Changes other than bug fixes must be mentioned in NEWS. Important
bug fixes should be mentioned in NEWS, too.
+* Changes which are potentially controversial, require a non-trivial
+ plan, or must be implemented gradually with a roadmap spanning several
+ releases (either minor or major) should be discussed on the list,
+ and have a proper entry in the PLANS directory. This entry should be
+ always committed in the "maint" branch, even if the change it deals
+ with is only for the master branch, or a topic branch. Usually, in
+ addition to this, it is useful to open a "wishlist" report on the
+ Automake debbugs tracker, to keep the idea more visible, and have the
+ discussions surrounding it easily archived in a central place.
+
============================================================================
= Naming
@@ -112,7 +122,7 @@
* There may be a number of longer-lived feature branches for new
developments. They should be based off of a common ancestor of all
active branches to which the feature should or might be merged later.
- in the future, we might introduce a special branch named 'next' that
+ In the future, we might introduce a special branch named 'next' that
may serve as common ground for feature merging and testing, should
they not yet be ready for master.
@@ -126,15 +136,17 @@
the active branches descending from the buggy commit. This offers a
simple way to fix the bug consistently and effectively.
-* For merges from branches other than maint, prefer 'git merge --log' over
- plain 'git merge', so that a later 'git log' gives an indication of which
- actual patches were merged even when they don't appear early in the list.
+* When merging, prefer 'git merge --log' over plain 'git merge', so that
+ a later 'git log' gives an indication of which actual patches were
+ merged even when they don't appear early in the list.
-* master and release branches should not be rewound, i.e., should always
- fast-forward, except maybe for privacy issues. The maint branch should not
- be rewound except maybe after retiring a release branch or a new stable
- release. For next, and for feature branches, the announcement for the
- branch should document rewinding policy.
+* The 'master' and 'maint' branches should not be rewound, i.e., should
+ always fast-forward, except maybe for privacy issues. For 'next'
+ (if that will ever be implemented), and for feature branches, the
+ announcement for the branch should document rewinding policy. If a
+ topic branch is expected to be rewound, it is good practice to put
+ it in the 'experimental/*' namespace; for example, a rewindable branch
+ dealing with Vala support could be named like "experimental/vala-work".
============================================================================
= Writing a good commit message
@@ -148,8 +160,9 @@
<reference to relevant bugs, if any>
Here goes a more detailed explanation of why the commit is needed,
- and a general overview of what it does, and how. This section is
- optional, but you are expected to provide it more often than not.
+ and a general overview of what it does, and how. This section
+ should almost always be provided, possibly only with the expection
+ of obvious fixes or very trivial changes.
And if the detailed explanation is quite long or detailed, you can
want to break it in more paragraphs.
@@ -166,10 +179,10 @@
<detailed list of touched files>
-* The <detailed list of touched files> is mandatory but for the most
- trivial changes, and should follows the GNU guidelines for ChangeLog
- entries (described explicitly in the GNU Coding Standards); it might
- be something of this sort:
+* The <detailed list of touched files> should usually be provided (but
+ for short or trivial changes), and should follow the GNU guidelines
+ for ChangeLog entries (described explicitly in the GNU Coding
+ Standards); it might be something of this sort:
* some/file (func1): Improved frobnication.
(func2): Adjusted accordingly.
@@ -235,9 +248,14 @@
The repository will always have its own "odd" number so we can easily
distinguish net and repo versions.)
-* Run this:
+* Run these commands, in this order:
- make bootstrap && make check && make distcheck
+ make bootstrap
+ make check keep_testdirs=yes
+ make maintainer-check
+ make distcheck
+ make check-no-trailing-backslash-in-recipes
+ make check-cc-no-c-o
It is also advised to run "git clean -fdx" before invoking the
bootstrap, to ensure a really clean rebuild. However, it must
diff --git a/INSTALL b/INSTALL
index 6e90e07..007e939 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
Installation Instructions
*************************
-Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation,
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
Inc.
Copying and distribution of this file, with or without modification,
diff --git a/Makefile.am b/Makefile.am
index 463cb53..21d21c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -116,7 +116,7 @@ maintainer-clean-local:
rm -rf .autom4te.cache
# So that automake won't complain about the missing ChangeLog.
-# The real rule for ChangeLog generation is now in main/maint.mk
+# The real rule for ChangeLog generation is now in maintainer/maint.mk
# (as it is maintainer-specific).
ChangeLog:
@@ -443,6 +443,17 @@ EXTRA_DIST += t/ax/shell-no-trail-bslash.in
CLEANFILES += t/ax/shell-no-trail-bslash
noinst_SCRIPTS += t/ax/shell-no-trail-bslash
+t/ax/cc-no-c-o: t/ax/cc-no-c-o.in Makefile
+ $(AM_V_at)rm -f $@ address@hidden
+ $(AM_V_GEN)in=t/ax/cc-no-c-o.in \
+ && $(MKDIR_P) t/ax \
+ && $(do_subst) <$(srcdir)/$$in >address@hidden \
+ && chmod a+x address@hidden
+ $(generated_file_finalize)
+EXTRA_DIST += t/ax/cc-no-c-o.in
+CLEANFILES += t/ax/cc-no-c-o
+noinst_SCRIPTS += t/ax/cc-no-c-o
+
runtest: t/ax/runtest.in Makefile
$(AM_V_at)rm -f $@ address@hidden
$(AM_V_GEN)in=t/ax/runtest.in \
@@ -515,6 +526,17 @@ check-no-trailing-backslash-in-recipes:
CONFIG_SHELL='$(abs_top_builddir)/t/ax/shell-no-trail-bslash'
.PHONY: check-no-trailing-backslash-in-recipes
+# Some compilers out there (hello, MSVC) still choke on "-c -o" being
+# passed together on the command line. Run the whole testsuite faking
+# the presence of such a compiler, to help catch regressions that would
+# otherwise only present themselves later "in the wild". See also the
+# long discussion about automake bug#13378.
+check-cc-no-c-o:
+ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) check \
+ CC='$(abs_top_builddir)/t/ax/cc-no-c-o' \
+ GNU_CC='$(abs_top_builddir)/t/ax/cc-no-c-o'
+.PHONY: check-cc-no-c-o
+
## Checking the list of tests.
test_subdirs = t t/pm contrib/t
include $(srcdir)/t/CheckListOfTests.am
@@ -681,8 +703,8 @@ EXTRA_DIST += \
## ---------------------------------------- ##
EXTRA_DIST += \
- maint/am-ft \
- maint/am-xft \
- maint/rename-tests \
- maint/maint.mk \
- maint/syntax-checks.mk
+ maintainer/am-ft \
+ maintainer/am-xft \
+ maintainer/rename-tests \
+ maintainer/maint.mk \
+ maintainer/syntax-checks.mk
diff --git a/NEWS b/NEWS
index e36d1cf..d24771d 100644
--- a/NEWS
+++ b/NEWS
@@ -105,6 +105,32 @@ New in 1.13.2:
should take precedence over the same-named automake-provided macro
(defined in '/usr/local/share/aclocal-1.14/vala.m4').
+* C compilation, and the AC_PROG_CC and AM_PROG_CC_C_O macros:
+
+ - The 'compile' script is now unconditionally required for all
+ packages that perform C compilation (note that if you are using
+ the '--add-missing' option, automake will fetch that script for
+ you, so you shouldn't need any explicit adjustment).
+ This new behaviour is needed to avoid obscure errors when the
+ 'subdir-objects' option is used, and the compiler is an inferior
+ one that doesn't grasp the combined use of both the "-c -o"
+ options; see discussion about automake bug#13378 for more details:
+ <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13378#35>
+ <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13378#44>
+
+ - Automake will automatically enhance the AC_PROG_CC autoconf macro
+ to make it check, at configure time, that the C compiler supports
+ the combined use of both the "-c -o" options. This "rewrite" of
+ AC_PROG_CC is only meant to be temporary, since future Autoconf
+ versions should provide all the features Automake needs.
+
+ - The AM_PROG_CC_C_O is no longer useful, and its use is a no-op
+ now. Future Automake versions might start warning that this
+ macro is obsolete. For better backward-compatibility, this macro
+ still sets a proper 'ac_cv_prog_cc_*_c_o' cache variable, and
+ define the 'NO_MINUS_C_MINUS_O' C preprocessor symbol, but you
+ should really stop relying on that.
+
* Obsolescent features:
- Use of suffix-less info files (that can be specified through the
diff --git a/PLANS/rm-f-without-args.txt b/PLANS/rm-f-without-args.txt
new file mode 100644
index 0000000..5d39e22
--- /dev/null
+++ b/PLANS/rm-f-without-args.txt
@@ -0,0 +1,40 @@
+Summary
+-------
+
+POSIX will say in a future version that calling "rm -f" with no argument
+is OK; and this sensible behaviour seem to be already very widespread in
+"the wild" (and possibly lacking only on those systems that are well on
+their way to obsolescence).
+
+Se we'd like to simplify several automake-generated "cleaning" rules
+accordingly, to get rid of the awful idiom:
+
+ test -z "$(VAR)" || rm -f $(VAR)
+
+See automake bug#10828.
+
+For Automake 1.13.2 (or 1.13.3)
+-------------------------------
+
+Add a temporary "probe check" in AM_INIT_AUTOMAKE that verifies that
+the no-args "rm -f" usage is supported on the system configure is
+being run on; complain loudly (but not with a fatal error) if this is
+not the case, and tell the user to report the situation to us.
+
+For Automake 1.14
+-----------------
+
+Make any failure in the configure-time probe check introduced by the
+previous point fatal; and in case of failure, also suggest to the user
+to install an older version of GNU coreutils to work around the
+limitation of his system (this version should be old enough not to
+be bootstrapped with Automake 1.14, otherwise the user will face a
+bootstrapping catch-22).
+
+In all our recipes, start assuming "rm -f" with no argument is OK;
+simplify and de-uglify the recipes accordingly.
+
+For Automake 1.15
+-----------------
+
+Remove the runtime probe altogether.
diff --git a/PLANS/subdir-objects.txt b/PLANS/subdir-objects.txt
new file mode 100644
index 0000000..e3aec6b
--- /dev/null
+++ b/PLANS/subdir-objects.txt
@@ -0,0 +1,67 @@
+Summary
+-------
+
+We want to make the behaviour currently enabled by the 'subdir-objects'
+the default one, and in fact the *only* one, in Automake 1.14.
+See automake bug#13378: <http://debbugs.gnu.org/13351>.
+
+Details
+-------
+
+The fact that Automake-generated Makefiles place compiled object files in
+the current directory by default, also when the corresponding source file
+is in a subdirectory, is basically an historical accident, due to the fact
+that the 'subdir-objects' option had only been introduced in April 1999,
+starting with commit 'user-dep-gen-branchpoint-56-g88b5959', and never
+made the default (likely to avoid backwards-compatibility issues).
+
+Since I believe the behaviour enabled by the 'subdir-objects' is the most
+useful one, and in fact the *only* natural one, I'd like to make it the
+only one available, simplifying the Automake implementation and APIs a
+little in the process.
+
+Alas, since this also means changing the default behaviour of Automake
+('subdir-objects' is not enabled by default, sadly), this means the
+transition path will be less smooth than I'd like.
+
+For automake 1.13.2 (ASAP)
+--------------------------
+
+Fix the bug spotted by Nick Bowler:
+
+ <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13378#35>
+ <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13378#44>
+
+and exposed in test case 't/ccnoco4.sh': currently, Automake-generated
+C compilation rules mistakenly pass the "-c -o" options combination
+unconditionally (even to losing compiler) when the 'subdir-objects' is
+used but sources are only present in the top-level directory.
+
+For automake 1.13.2 (with more ease)
+------------------------------------
+
+Give a warning in the category 'unsupported' if the 'subdir-objects'
+option is not specified. This should give the users enough forewarning
+about the planned change, and give them time to update their packages
+to the new semantic.
+
+This warning, when there are C sources in subdirs, should also mention the
+need to use AM_PROG_CC_C_O in configure.ac (thanks to Peter Breitenlohner
+for suggesting this). This is not strictly required, but will make
+things a little simpler for the users, by giving a more complete feedback:
+<http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13378#29>
+
+Be sure to avoid the warning when it would be irrelevant, i.e., if all
+source files sit in "current" directory (thanks to Peter Johansson for
+suggesting this).
+
+For automake 1.14
+-----------------
+
+Flip the 'subdir-object' option on by default. At the same time,
+drop support for the "old" behaviour of having object files derived
+from sources in a subdirectory being placed in the current directory
+rather than in that same subdirectory.
+
+Still keep the 'subdir-object' option supported (as a simple no-op
+now), to save useless churn in our user's build systems.
diff --git a/automake.in b/automake.in
index d2e12a9..a1d1f2e 100644
--- a/automake.in
+++ b/automake.in
@@ -378,9 +378,6 @@ my $package_version_location;
# TRUE if we've seen AM_PROG_AR
my $seen_ar = 0;
-# TRUE if we've seen AM_PROG_CC_C_O
-my $seen_cc_c_o = 0;
-
# Location of AC_REQUIRE_AUX_FILE calls, indexed by their argument.
my %required_aux_file = ();
@@ -5160,7 +5157,6 @@ sub scan_autoconf_traces ($)
AM_INIT_AUTOMAKE => 0,
AM_MAINTAINER_MODE => 0,
AM_PROG_AR => 0,
- AM_PROG_CC_C_O => 0,
_AM_SUBST_NOTMAKE => 1,
_AM_COND_IF => 1,
_AM_COND_ELSE => 1,
@@ -5356,10 +5352,6 @@ EOF
{
$seen_ar = $where;
}
- elsif ($macro eq 'AM_PROG_CC_C_O')
- {
- $seen_cc_c_o = $where;
- }
elsif ($macro eq '_AM_COND_IF')
{
cond_stack_if ('', $args[1], $where);
@@ -5579,45 +5571,6 @@ sub lang_sub_obj
return option 'subdir-objects' ? LANG_SUBDIR : LANG_PROCESS;
}
-# Rewrite a single C source file.
-sub lang_c_rewrite
-{
- my ($directory, $base, $ext, $obj, $have_per_exec_flags, $var) = @_;
-
- my $r = LANG_PROCESS;
- if (option 'subdir-objects')
- {
- $r = LANG_SUBDIR;
- if ($directory && $directory ne '.')
- {
- $base = $directory . '/' . $base;
-
- # libtool is always able to put the object at the proper place,
- # so we do not have to require AM_PROG_CC_C_O when building .lo files.
- msg_var ('portability', $var,
- "compiling '$base.c' in subdir requires "
- . "'AM_PROG_CC_C_O' in '$configure_ac'",
- uniq_scope => US_GLOBAL,
- uniq_part => 'AM_PROG_CC_C_O subdir')
- unless $seen_cc_c_o || $obj eq '.lo';
- }
- }
-
- if (! $seen_cc_c_o
- && $have_per_exec_flags
- && ! option 'subdir-objects'
- && $obj ne '.lo')
- {
- msg_var ('portability',
- $var, "compiling '$base.c' with per-target flags requires "
- . "'AM_PROG_CC_C_O' in '$configure_ac'",
- uniq_scope => US_GLOBAL,
- uniq_part => 'AM_PROG_CC_C_O per-target')
- }
-
- return $r;
-}
-
# Rewrite a single header file.
sub lang_header_rewrite
{
diff --git a/bootstrap.sh b/bootstrap.sh
index 7704fc1..bb4221d 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -37,10 +37,9 @@ BOOTSTRAP_SHELL=${BOOTSTRAP_SHELL-/bin/sh}
VERSION=`sed -ne '/AC_INIT/s/^[^[]*\[[^[]*\[\([^]]*\)\].*$/\1/p' configure.ac`
PACKAGE=automake
datadir=.
-PERL_THREADS=0
# This should be automatically updated by the 'update-copyright'
# rule of our Makefile.
-RELEASE_YEAR=2012
+RELEASE_YEAR=2013
# Read the rule for calculating APIVERSION and execute it.
apiver_cmd=`sed -ne 's/\[\[/[/g;s/\]\]/]/g;/^APIVERSION=/p' configure.ac`
@@ -76,7 +75,6 @@ dosubst ()
sed -e "address@hidden@%$APIVERSION%g" \
-e "address@hidden@%$PACKAGE%g" \
-e "address@hidden@%$PERL%g" \
- -e "address@hidden@%$PERL_THREADS%g" \
-e "address@hidden@%$BOOTSTRAP_SHELL%g" \
-e "address@hidden@%$VERSION%g" \
-e "address@hidden@%$datadir%g" \
diff --git a/configure.ac b/configure.ac
index f066e34..9984250 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ AM_INIT_AUTOMAKE([-Wall -Werror dist-xz filename-length-max=99
## Keep this on a line of its own, since it must be found and processed
## by the 'update-copyright' rule in our Makefile.
-RELEASE_YEAR=2012
+RELEASE_YEAR=2013
AC_SUBST([RELEASE_YEAR])
# The API version is the base version. We must guarantee
@@ -86,32 +86,6 @@ installed, select the one Automake should use using
./configure PERL=/path/to/perl])
}
-# We require ithreads support, and version 5.7.2 for CLONE.
-AC_CACHE_CHECK([whether $PERL supports ithreads], [am_cv_prog_PERL_ithreads],
-[if $PERL -e '
- require 5.007_002;
- use Config;
- if ($Config{useithreads})
- {
- require threads;
- import threads;
- require Thread::Queue;
- import Thread::Queue;
- exit 0;
- }
- exit 1;' >&AS_MESSAGE_LOG_FD 2>&1
-then
- am_cv_prog_PERL_ithreads=yes
-else
- am_cv_prog_PERL_ithreads=no
-fi])
-if test $am_cv_prog_PERL_ithreads = yes; then
- PERL_THREADS=1;
-else
- PERL_THREADS=0;
-fi
-AC_SUBST([PERL_THREADS])
-
# The test suite will skip some tests if tex is absent.
AC_CHECK_PROG([TEX], [tex], [tex])
# Save details about the selected TeX program in config.log.
diff --git a/doc/automake.texi b/doc/automake.texi
index 496306c..8aaaa4e 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -176,6 +176,7 @@ Scanning @file{configure.ac}, using @command{aclocal}
* Optional:: Other things Automake recognizes
* aclocal Invocation:: Auto-generating aclocal.m4
* Macros:: Autoconf macros supplied with Automake
+* Obsolete Macros:: Obsolete macros you should no longer use
Auto-generating aclocal.m4
@@ -1496,6 +1497,7 @@ command as follows:
~/amhello % @kbd{autoreconf --install}
configure.ac: installing './install-sh'
configure.ac: installing './missing'
+configure.ac: installing './compile'
src/Makefile.am: installing './depcomp'
@end example
@@ -3873,6 +3875,7 @@ Automake ships with several Autoconf macros that you can
use from your
@menu
* Public Macros:: Macros that you can use.
* Private Macros:: Macros that you should not use.
+* Obsolete Macros:: Obsolete macros you should no longer use
@end menu
@c consider generating the following subsections automatically from m4 files.
@@ -3985,10 +3988,9 @@ choose the assembler for you (by default the C compiler)
and set
@item AM_PROG_CC_C_O
@acindex AM_PROG_CC_C_O
@acindex AC_PROG_CC_C_O
-This is like @code{AC_PROG_CC_C_O}, but it generates its results in
-the manner required by Automake. You must use this instead of
address@hidden when you need this functionality, that is, when
-using per-target flags or subdir-objects with C sources.
+This is an @emph{obsolete wrapper} around @code{AC_PROG_CC_C_O}.
+New code needs not use this macro. It might be deprecated and
address@hidden in future Automake versions}.
@item AM_PROG_LEX
@acindex AM_PROG_LEX
@@ -4043,6 +4045,27 @@ define @code{WITH_DMALLOC} and add @option{-ldmalloc} to
@code{LIBS}.
@end table
address@hidden Obsolete Macros
address@hidden Obsolete macros you should no longer use
address@hidden obsolete macros
+
+Although using some of the following macros was required in past
+releases, you should not use any of them in new code. Also, all
+these macros will be @emph{removed in some future Automake version},
+so you should consider updating your @file{configure.ac} to avoid
+problems in the future.
+
address@hidden @code
+
address@hidden AM_PROG_CC_C_O
address@hidden AM_PROG_CC_C_O
address@hidden AC_PROG_CC_C_O
+This is an @emph{obsolete wrapper} around @code{AC_PROG_CC_C_O}. New
+code needs not to use this macro. It will be deprecated, and then
+removed, in future Automake versions.
+
address@hidden table
+
@node Private Macros
@subsection Private Macros
@@ -5762,9 +5785,7 @@ different name for the intermediate object files.
Ordinarily a file
like @file{sample.c} will be compiled to produce @file{sample.o}.
However, if the program's @code{_CFLAGS} variable is set, then the
object file will be named, for instance, @file{maude-sample.o}. (See
-also @ref{Renamed Objects}.) The use of per-target compilation flags
-with C sources requires that the macro @code{AM_PROG_CC_C_O} be called
-from @file{configure.ac}.
+also @ref{Renamed Objects}).
In compilations with per-target flags, the ordinary @samp{AM_} form of
the flags variable is @emph{not} automatically included in the
@@ -10191,9 +10212,6 @@ the source file. For instance, if the source file is
@file{subdir/file.cxx}, then the output file would be
@file{subdir/file.o}.
-In order to use this option with C sources, you should add
address@hidden to @file{configure.ac}.
-
@anchor{tar-formats}
@item @option{tar-v7}
@itemx @option{tar-ustar}
diff --git a/lib/Automake/Config.in b/lib/Automake/Config.in
index fe6ef9d..885e74e 100644
--- a/lib/Automake/Config.in
+++ b/lib/Automake/Config.in
@@ -33,7 +33,14 @@ our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@';
our $VERSION = '@VERSION@';
our $RELEASE_YEAR = '@RELEASE_YEAR@';
our $libdir = '@datadir@/@address@hidden@APIVERSION@';
-our $perl_threads = @PERL_THREADS@;
+
+our $perl_threads = 0;
+# We need at least this version for CLONE support.
+if (eval { require 5.007_002; })
+ {
+ use Config;
+ $perl_threads = $Config{useithreads};
+ }
1;
diff --git a/lib/INSTALL b/lib/INSTALL
index 6e90e07..007e939 100644
--- a/lib/INSTALL
+++ b/lib/INSTALL
@@ -1,7 +1,7 @@
Installation Instructions
*************************
-Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation,
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
Inc.
Copying and distribution of this file, with or without modification,
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 80d4185..5c6439a 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -27,34 +27,10 @@
## the "if AMDEP" chunk is prefix with @AMDEP_TRUE@ just like for any
## other configure-time conditional.
##
-## We do likewise for %FASTDEP%; this expands to an ordinary
-## configure-time conditional. %FASTDEP% is used to speed up the
-## common case of building a package with gcc 3.x. In this case we
-## can skip the use of depcomp and easily inline the dependency
-## tracking.
-
-## Verbosity of FASTDEP rules
-## --------------------------
-## (1) Some people want to see what happens during make. They think
-## @-commands are evil because hiding things hinders debugging.
-## (2) Other people want to see only the important commands--those that
-## may produce diagnostics, such as compiler invocations. They
-## do not care about build details such as dependency generation
-## (the if/then/else machinery in FASTDEP rules). Their point is
-## that it is hard to spot diagnostics in a verbose output.
-## (3) Other people want "make -s" to work as expected: silently.
-## This way they can spot any diagnostic really easily.
-##
-## The second point suggests we hide rules with @ and that we 'echo'
-## only the relevant parts. However this goes against the two others.
-## There are regular complaints about this on the mailing list, but
-## it's hard to please everybody. On April 2003, William Fulton (from
-## clan (3)) and Karl Berry (from clan (2)) agreed that folding the
-## compile rules so that they are output on a single line (instead of 5)
-## would be a good compromise. Actually we use two lines rather than one,
-## because this way %SOURCE% is always located at the end of the first
-## line and is therefore easier to spot. (We need an extra line when
-## depbase is used.)
+## We do likewise for %FASTDEP%; this expands to an ordinary configure-time
+## conditional. %FASTDEP% is used to speed up the common case of building
+## a package with gcc 3.x or later. In this case we can skip the use of
+## depcomp and easily inline the dependency tracking.
if %?NONLIBTOOL%
?GENERIC?%EXT%.o:
diff --git a/lib/config.guess b/lib/config.guess
index 1804e9f..0aee604 100755
--- a/lib/config.guess
+++ b/lib/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012, 2013 Free Software Foundation, Inc.
-timestamp='2012-12-29'
+timestamp='2012-12-30'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ timestamp='2012-12-29'
# program. This Exception is an additional permission under section 7
# of the GNU General Public License, version 3 ("GPLv3").
#
-# Originally written by Per Bothner.
+# Originally written by Per Bothner.
#
# You can get the latest version of this script from:
#
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
diff --git a/lib/config.sub b/lib/config.sub
index 802a224..707e9e2 100755
--- a/lib/config.sub
+++ b/lib/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012, 2013 Free Software Foundation, Inc.
-timestamp='2012-12-29'
+timestamp='2013-01-11'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -290,6 +290,7 @@ case $basic_machine in
| mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
+ | mipsr5900 | mipsr5900el \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
| moxie \
@@ -407,6 +408,7 @@ case $basic_machine in
| mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipsr5900-* | mipsr5900el-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
| mt-* \
@@ -1354,7 +1356,7 @@ case $os in
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos |
-sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* |
-solaris* \
- | -sym* | -kopensolaris* \
+ | -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1500,9 +1502,6 @@ case $os in
-aros*)
os=-aros
;;
- -kaos*)
- os=-kaos
- ;;
-zvmoe)
os=-zvmoe
;;
diff --git a/lib/gendocs_template b/lib/gendocs_template
index a62ad61..63fbe53 100644
--- a/lib/gendocs_template
+++ b/lib/gendocs_template
@@ -75,7 +75,7 @@ the FSF.<br />
Please send broken links and other corrections or suggestions to
<a href="mailto:%%EMAIL%%";><%%EMAIL%%></a>.</p>
-<p>Copyright © 2012 Free Software Foundation, Inc.</p>
+<p>Copyright © 2013 Free Software Foundation, Inc.</p>
<p>Verbatim copying and distribution of this entire article are
permitted worldwide, without royalty, in any medium, provided this
diff --git a/lib/gitlog-to-changelog b/lib/gitlog-to-changelog
index 5184edc..e02d34c 100755
--- a/lib/gitlog-to-changelog
+++ b/lib/gitlog-to-changelog
@@ -9,7 +9,7 @@ my $VERSION = '2012-07-29 06:11'; # UTC
# If you change this file with Emacs, please let the write hook
# do its job. Otherwise, update this string manually.
-# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+# Copyright (C) 2008-2013 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
diff --git a/lib/gnupload b/lib/gnupload
index f6b999b..e329e83 100755
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -3,7 +3,7 @@
scriptversion=2012-12-11.16; # UTC
-# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2013 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
diff --git a/lib/texinfo.tex b/lib/texinfo.tex
index b5f3141..d64f45b 100644
--- a/lib/texinfo.tex
+++ b/lib/texinfo.tex
@@ -3,11 +3,11 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2012-11-08.11}
+\def\texinfoversion{2013-01-01.15}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-% 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+% 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
%
% This texinfo.tex file is free software: you can redistribute it and/or
% modify it under the terms of the GNU General Public License as
@@ -24,7 +24,8 @@
%
% As a special exception, when this file is read by TeX when processing
% a Texinfo source document, you may use the result without
-% restriction. (This has been our intent since Texinfo was invented.)
+% restriction. This Exception is an additional permission under section 7
+% of the GNU General Public License, version 3 ("GPLv3").
%
% Please try the latest version of texinfo.tex before submitting bug
% reports; you can get the latest version from:
diff --git a/lib/update-copyright b/lib/update-copyright
index 082b749..c72d0e6 100755
--- a/lib/update-copyright
+++ b/lib/update-copyright
@@ -3,9 +3,9 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0"
${1+"$@"}'
if 0;
# Update an FSF copyright year list to include the current year.
-my $VERSION = '2012-02-05.21:39'; # UTC
+my $VERSION = '2013-01-03.09:41'; # UTC
-# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 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
@@ -192,7 +192,7 @@ if (defined $stmt_re)
if ($final_year != $this_year)
{
# Update the year.
- $stmt =~ s/$final_year_orig/$final_year, $this_year/;
+ $stmt =~ s/\b$final_year_orig\b/$final_year, $this_year/;
}
if ($final_year != $this_year || $ENV{'UPDATE_COPYRIGHT_FORCE'})
{
diff --git a/m4/init.m4 b/m4/init.m4
index 7535706..6857c44 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -124,6 +124,51 @@ dnl mangled by Autoconf and run in a shell conditional
statement.
m4_define([_AC_COMPILER_EXEEXT],
m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+dnl We have to redefine AC_PROG_CC to allow our compile rules to use
+dnl "-c -o" together also with losing compilers.
+dnl FIXME: Add references to the original discussion and bug report.
+dnl FIXME: Shameless copy & paste from Autoconf internals, since trying to
+dnl play smart among tangles of AC_REQUIRE, m4_defn, m4_provide and
+dnl other tricks was proving too difficult, and in the end, likely
+dnl more brittle too. And this should anyway be just a temporary
+dnl band-aid, until Autoconf provides the semantics and/or hooks we
+dnl need (hint hint, nudge nudge) ...
+AC_DEFUN([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+dnl FIXME The following abomination is expected to disappear in
+dnl Automake 1.14.
+AC_MSG_CHECKING([whether $CC understands -c and -o together])
+set dummy $CC; am__cc=`AS_ECHO(["$[2]"]) | \
+ sed 's/[[^a-zA-Z0-9_]]/_/g;s/^[[0-9]]/_/'`
+AC_CACHE_VAL([am_cv_prog_cc_${am__cc}_c_o],
+[AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+# Make sure it works both with $CC and with simple cc.
+# We do the test twice because some compilers refuse to overwrite an
+# existing .o file with -o, though they will create one.
+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&AS_MESSAGE_LOG_FD'
+rm -f conftest2.*
+if _AC_DO_VAR(ac_try) && test -f conftest2.$ac_objext
+then
+ eval am_cv_prog_cc_${am__cc}_c_o=yes
+else
+ eval am_cv_prog_cc_${am__cc}_c_o=no
+fi
+rm -f core conftest*
+])dnl
+if eval test \"\$am_cv_prog_cc_${am__cc}_c_o\" = yes; then
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_RESULT([no])
+ # Losing compiler, so wrap it with the 'compile' script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+fi
+])
# When config.status generates a header, we must update the stamp-h file.
# This file resides in the same directory as the config header
diff --git a/m4/minuso.m4 b/m4/minuso.m4
index 984427c..17fa8c9 100644
--- a/m4/minuso.m4
+++ b/m4/minuso.m4
@@ -7,26 +7,19 @@
# AM_PROG_CC_C_O
# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
+# Basically a no-op now, completely superseded by the AC_PROG_CC
+# adjusted by Automake. Kept for backward-compatibility.
AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
- # Losing compiler, so override with the script.
- # FIXME: It is wrong to rewrite CC.
- # But if we don't then we get into trouble of one sort or another.
- # A longer-term fix would be to have automake use am__CC in this case,
- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
- CC="$am_aux_dir/compile $CC"
-fi
+[AC_REQUIRE([AC_PROG_CC])dnl
dnl Make sure AC_PROG_CC is never called again, or it will override our
dnl setting of CC.
m4_define([AC_PROG_CC],
[m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
+# For better backward-compatibility. Users are advised to stop
+# relying on this cache variable and C preprocessor symbol ASAP.
+eval ac_cv_prog_cc_${am__cc}_c_o=\$am_cv_prog_cc_${am__cc}_c_o
+if eval test \"\$ac_cv_prog_cc_${am__cc}_c_o\" != yes; then
+ AC_DEFINE([NO_MINUS_C_MINUS_O], [1],
+ [Define to 1 if your C compiler doesn't accept -c and -o
together.])
+fi
])
diff --git a/maint/am-xft b/maint/am-xft
deleted file mode 100755
index 564aa3b..0000000
--- a/maint/am-xft
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-MAKE=${MAKE-make} GIT=${GIT-git}
-$GIT clean -fdx && $MAKE bootstrap && $MAKE dist && exec am-ft "$@"
diff --git a/maint/rename-tests b/maint/rename-tests
deleted file mode 100755
index 6fce9fe..0000000
--- a/maint/rename-tests
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-# Convenience script to rename test cases in Automake.
-
-set -e -u
-
-me=${0##*/}
-fatal () { echo "$me: $*" >&2; exit 1; }
-
-case $# in
- 0) input=$(cat);;
- 1) input=$(cat -- "$1");;
- *) fatal "too many arguments";;
-esac
-
-AWK=${AWK-awk}
-SED=${SED-sed}
-
-[[ -f automake.in && -d lib/Automake ]] \
- || fatal "can only be run from the top-level of the Automake source tree"
-
-$SED --version 2>&1 | grep GNU >/dev/null 2>&1 \
- || fatal "GNU sed is required by this script"
-
-# Validate and cleanup input.
-input=$(
- $AWK -v me="$me" "
- /^#/ { next; }
- (NF == 0) { next; }
- (NF != 2) { print me \": wrong number of fields at line \" NR;
- exit(1); }
- { printf (\"t/%s t/%s\\n\", \$1, \$2); }
- " <<<"$input")
-
-# Prepare git commit message.
-exec 5>$me.git-msg
-echo "tests: more significant names for some tests" >&5
-echo >&5
-$AWK >&5 <<<"$input" \
- '{ printf ("* %s: Rename...\n* %s: ... like this.\n", $1, $2) }'
-exec 5>&-
-
-# Rename tests.
-eval "$($AWK '{ printf ("git mv %s %s\n", $1, $2) }' <<<"$input")"
-
-# Adjust the list of tests (do this conditionally, since such a
-# list is not required nor used in Automake-NG.
-if test -f t/list-of-tests.mk; then
- $SED -e "$($AWK '{ printf ("s|^%s |%s |\n", $1, $2) }' <<<"$input")" \
- -i t/list-of-tests.mk
-fi
-
-git status
diff --git a/maint/am-ft b/maintainer/am-ft
similarity index 79%
rename from maint/am-ft
rename to maintainer/am-ft
index d8a2722..1d22790 100755
--- a/maint/am-ft
+++ b/maintainer/am-ft
@@ -1,6 +1,22 @@
#!/usr/bin/env bash
# Remote testing of Automake tarballs made easy.
# This script requires Bash 4.x or later.
+
+# Copyright (C) 2013 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
# TODO: some documentation would be nice ...
set -u
diff --git a/t/pm/Version2.pl b/maintainer/am-xft
old mode 100644
new mode 100755
similarity index 79%
copy from t/pm/Version2.pl
copy to maintainer/am-xft
index 3fb9e00..d7fee4c
--- a/t/pm/Version2.pl
+++ b/maintainer/am-xft
@@ -1,20 +1,18 @@
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
-#
+#!/bin/sh
+# Copyright (C) 2013 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
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
-#
+
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# prog_error due to invalid $VERSION.
-
-use Automake::Version;
-
-Automake::Version::check ('', '1.2.3');
+MAKE=${MAKE-make} GIT=${GIT-git}
+$GIT clean -fdx && $MAKE bootstrap && $MAKE dist && exec am-ft "$@"
diff --git a/maint/maint.mk b/maintainer/maint.mk
similarity index 97%
rename from maint/maint.mk
rename to maintainer/maint.mk
index 69b1630..1ea10a2 100644
--- a/maint/maint.mk
+++ b/maintainer/maint.mk
@@ -449,11 +449,17 @@ files_without_copyright += lib/mkinstalldirs
# This script has an MIT-style license
files_without_copyright += lib/install-sh
+# The UPDATE_COPYRIGHT_YEAR environment variable is honoured by the
+# 'lib/update-copyright' script.
.PHONY: update-copyright
update-copyright:
$(AM_V_GEN)set -e; \
- current_year=`date +%Y` && test -n "$$current_year" \
- || { echo "$@: cannot get current year" >&2; exit 1; }; \
+ if test -n "$$UPDATE_COPYRIGHT_YEAR"; then \
+ current_year=$$UPDATE_COPYRIGHT_YEAR; \
+ else \
+ current_year=`date +%Y` && test -n "$$current_year" \
+ || { echo "$@: cannot get current year" >&2; exit 1; }; \
+ fi; \
sed -i "/^RELEASE_YEAR=/s/=.*$$/=$$current_year/" \
bootstrap.sh configure.ac; \
excluded_re=`( \
@@ -463,5 +469,6 @@ update-copyright:
) | sed -e '$$!s,$$,|,' | tr -d '\012\015'`; \
$(GIT) ls-files \
| grep -Ev '(^|/)README$$' \
+ | grep -Ev '^PLANS(/|$$)' \
| grep -Ev "^($$excluded_re)$$" \
| $(update_copyright_env) xargs $(srcdir)/lib/$@
diff --git a/maintainer/rename-tests b/maintainer/rename-tests
new file mode 100755
index 0000000..a584748
--- /dev/null
+++ b/maintainer/rename-tests
@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+# Convenience script to rename test cases in Automake.
+
+# Copyright (C) 2013 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+set -e -u
+
+me=${0##*/}
+fatal () { echo "$me: $*" >&2; exit 1; }
+
+case $# in
+ 0) input=$(cat);;
+ 1) input=$(cat -- "$1");;
+ *) fatal "too many arguments";;
+esac
+
+AWK=${AWK-awk}
+SED=${SED-sed}
+
+[[ -f automake.in && -d lib/Automake ]] \
+ || fatal "can only be run from the top-level of the Automake source tree"
+
+$SED --version 2>&1 | grep GNU >/dev/null 2>&1 \
+ || fatal "GNU sed is required by this script"
+
+# Validate and cleanup input.
+input=$(
+ $AWK -v me="$me" "
+ /^#/ { next; }
+ (NF == 0) { next; }
+ (NF != 2) { print me \": wrong number of fields at line \" NR;
+ exit(1); }
+ { printf (\"t/%s t/%s\\n\", \$1, \$2); }
+ " <<<"$input")
+
+# Prepare git commit message.
+exec 5>$me.git-msg
+echo "tests: more significant names for some tests" >&5
+echo >&5
+$AWK >&5 <<<"$input" \
+ '{ printf ("* %s: Rename...\n* %s: ... like this.\n", $1, $2) }'
+exec 5>&-
+
+# Rename tests.
+eval "$($AWK '{ printf ("git mv %s %s\n", $1, $2) }' <<<"$input")"
+
+# Adjust the list of tests (do this conditionally, since such a
+# list is not required nor used in Automake-NG.
+if test -f t/list-of-tests.mk; then
+ $SED -e "$($AWK '{ printf ("s|^%s |%s |\n", $1, $2) }' <<<"$input")" \
+ -i t/list-of-tests.mk
+fi
+
+git status
diff --git a/maint/syntax-checks.mk b/maintainer/syntax-checks.mk
similarity index 100%
rename from maint/syntax-checks.mk
rename to maintainer/syntax-checks.mk
diff --git a/t/acsubst2.sh b/t/acsubst2.sh
index 2428dc2..fc7c9ad 100755
--- a/t/acsubst2.sh
+++ b/t/acsubst2.sh
@@ -18,7 +18,6 @@
cat >> configure.ac << 'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AC_SUBST([FOOBAR_CFLAGS],[blablabla])
END
diff --git a/t/add-missing.tap b/t/add-missing.tap
index f74c2fd..9c4b774 100755
--- a/t/add-missing.tap
+++ b/t/add-missing.tap
@@ -247,6 +247,7 @@ check_ <<'END'
depcomp/C
== Files ==
depcomp
+compile
== configure.ac ==
AC_PROG_CC
== Makefile.am ==
@@ -271,9 +272,9 @@ compile
== Files ==
compile
== configure.ac ==
-# Using AM_PROG_CC_C_O in configure.ac should be enough. No need to
-# use AC_PROG_CC too, nor to define xxx_PROGRAMS in Makefile.am.
-AM_PROG_CC_C_O
+# Using AC_PROG_CC in configure.ac should be enough. No
+# need to also define, say, xxx_PROGRAMS in Makefile.am.
+AC_PROG_CC
END
# For config.guess and config.sub.
@@ -294,6 +295,7 @@ check_ <<'END'
== Name ==
ylwrap/Lex
== Files ==
+compile
ylwrap
== configure.ac ==
AC_PROG_CC
@@ -308,6 +310,7 @@ check_ <<'END'
== Name ==
ylwrap/Yacc
== Files ==
+compile
ylwrap
== configure.ac ==
AC_PROG_CC
diff --git a/t/am-prog-cc-c-o.sh b/t/am-prog-cc-c-o.sh
new file mode 100755
index 0000000..da6a3a4
--- /dev/null
+++ b/t/am-prog-cc-c-o.sh
@@ -0,0 +1,91 @@
+#! /bin/sh
+# Copyright (C) 2013 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Check that uses of the obsolescent AM_PROG_CC_C_O macro doesn't
+# cause spurious warnings or errors. Suggested by Eric Blake.
+
+# We need gcc for for two reasons:
+# 1. to ensure our C compiler grasps "-c -o" together.
+# 2. to be able to later fake a dumb compiler not grasping that
+# (done with 'cc-no-c-o' script below, which required gcc).
+required=gcc
+. test-init.sh
+
+echo bin_PROGRAMS = foo > Makefile.am
+echo 'int main (void) { return 0; }' > foo.c
+
+cp configure.ac configure.bak
+
+cat >> configure.ac << 'END'
+# Since AM_PROG_CC_C_O rewrites $CC, it's an error to call AC_PROG_CC
+# after it.
+AM_PROG_CC_C_O
+AC_PROG_CC
+END
+
+$ACLOCAL -Wnone 2>stderr && { cat stderr >&2; exit 1; }
+cat stderr >&2
+grep '^configure\.ac:7:.* AC_PROG_CC .*called after AM_PROG_CC_C_O' stderr
+
+cat configure.bak - > configure.ac << 'END'
+dnl It's OK to call AM_PROG_CC_C_O after AC_PROG_CC.
+AC_PROG_CC
+AM_PROG_CC_C_O
+# Make sure that $CC can be used after AM_PROG_CC_C_O.
+$CC --version || exit 1
+$CC -v || exit 1
+AC_OUTPUT
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure >stdout || { cat stdout; exit 1; }
+cat stdout
+grep 'understands -c and -o together.* yes$' stdout
+# No repeated checks please.
+test $(grep -c ".*-c['\" ].*-o['\" ]" stdout) -eq 1
+$MAKE
+
+$MAKE maintainer-clean
+
+rm -rf autom4te*.cache
+
+cat configure.bak - > configure.ac << 'END'
+dnl It's also OK to call AM_PROG_CC_C_O *without* AC_PROG_CC.
+AM_PROG_CC_C_O
+# Make sure that $CC can be used after AM_PROG_CC_C_O.
+$CC --version || exit 1
+$CC -v || exit 1
+AC_OUTPUT
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+# Make sure the compiler doesn't understand '-c -o'
+CC=$am_testaux_builddir/cc-no-c-o; export CC
+
+./configure >stdout || { cat stdout; exit 1; }
+cat stdout
+grep 'understands -c and -o together.* no$' stdout
+# No repeated checks please.
+test $(grep -c ".*-c['\" ].*-o['\" ]" stdout) -eq 1
+$MAKE
+
+:
diff --git a/t/ax/am-test-lib.sh b/t/ax/am-test-lib.sh
index f3fcacc..0ceb4d0 100644
--- a/t/ax/am-test-lib.sh
+++ b/t/ax/am-test-lib.sh
@@ -820,7 +820,7 @@ am_setup_testdir ()
|| framework_failure_ "cannot chdir into test subdirectory"
if test x"$am_create_testdir" != x"empty"; then
cp "$am_scriptdir"/install-sh "$am_scriptdir"/missing \
- "$am_scriptdir"/depcomp . \
+ "$am_scriptdir"/compile "$am_scriptdir"/depcomp . \
|| framework_failure_ "fetching common files from $am_scriptdir"
# Build appropriate environment in test directory. E.g., create
# configure.ac, touch all necessary files, etc. Don't use AC_OUTPUT,
diff --git a/t/includes-no-more.sh b/t/ax/cc-no-c-o.in
old mode 100755
new mode 100644
similarity index 66%
copy from t/includes-no-more.sh
copy to t/ax/cc-no-c-o.in
index 4867ee5..c18f9b9
--- a/t/includes-no-more.sh
+++ b/t/ax/cc-no-c-o.in
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! @AM_TEST_RUNNER_SHELL@
# Copyright (C) 2012-2013 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
@@ -14,19 +14,16 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Support for $(INCLUDES) has been removed.
+# A "C compiler" that chokes when the '-c' and '-o' options are passed
+# together to it on the command line. See also automake bug#13378.
-. test-init.sh
+am_CC=${AM_TESTSUITE_GNU_CC-'@GNU_CC@'}
-echo AC_PROG_CC >> configure.ac
+case " $* " in
+ *\ -c*\ -o* | *\ -o*\ -c*)
+ echo "$0: both '-o' and '-c' seen on the command line" >&2
+ exit 2
+ ;;
+esac
-cat > Makefile.am << 'END'
-bin_PROGRAMS = foo
-INCLUDES = -DFOO
-END
-
-$ACLOCAL
-AUTOMAKE_fails -Wnone -Wno-error
-grep "^Makefile\\.am:2:.* 'INCLUDES'.* obsolete.* 'AM_CPPFLAGS'" stderr
-
-:
+exec $am_CC "$@"
diff --git a/t/ax/depcomp.sh b/t/ax/depcomp.sh
index cdeaae5..0e5b6a5 100644
--- a/t/ax/depcomp.sh
+++ b/t/ax/depcomp.sh
@@ -132,7 +132,6 @@ AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE
AC_PROG_CC
-AM_PROG_CC_C_O
AM_PROG_AR
$(if test $depcomp_with_libtool = yes; then
echo AC_PROG_LIBTOOL
diff --git a/t/c-demo.sh b/t/c-demo.sh
index df2fc55..a0012e2 100755
--- a/t/c-demo.sh
+++ b/t/c-demo.sh
@@ -27,7 +27,6 @@ AC_CONFIG_SRCDIR([tests/test.test])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE
AC_PROG_CC
-AM_PROG_CC_C_O
AM_PROG_AR
AC_PROG_RANLIB
AM_CONDITIONAL([RUN_TESTS], [test x"$run_tests" != x"no"])
diff --git a/t/ccnoco.sh b/t/ccnoco.sh
index cffabd7..be9be37 100755
--- a/t/ccnoco.sh
+++ b/t/ccnoco.sh
@@ -17,14 +17,12 @@
# Test to make sure we can compile when the compiler doesn't
# understand '-c -o'.
-required=gcc
+required=gcc # For cc-no-c-o.
. test-init.sh
cat >> configure.ac << 'END'
AC_PROG_CC
-AM_PROG_CC_C_O
-# Make sure that $CC can be used after AM_PROG_CC_C_O.
-$CC -v || exit 1
+$CC --version; $CC -v; # For debugging.
AC_OUTPUT
END
@@ -44,25 +42,8 @@ int main ()
}
END
-cat > Mycomp << END
-#!/bin/sh
-
-case " \$* " in
- *\ -c*\ -o* | *\ -o*\ -c*)
- exit 1
- ;;
-esac
-
-# Use '$CC', not 'gcc', to honour the compiler chosen
-# by the testsuite setup.
-exec $CC "\$@"
-END
-
-chmod +x Mycomp
-
# Make sure the compiler doesn't understand '-c -o'
-CC=$(pwd)/Mycomp
-export CC
+CC=$am_testaux_builddir/cc-no-c-o; export CC
$ACLOCAL
$AUTOCONF
diff --git a/t/ccnoco2.sh b/t/ccnoco2.sh
deleted file mode 100755
index a835fa6..0000000
--- a/t/ccnoco2.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006-2013 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure Automake requires AM_PROG_CC_C_O when either per-targets
-# flags or subdir-objects are used.
-
-. test-init.sh
-
-cat >>configure.ac <<EOF
-AC_PROG_CC
-AC_OUTPUT
-EOF
-
-cat >Makefile.am <<EOF
-bin_PROGRAMS = wish
-wish_SOURCES = a.c
-wish_CPPFLAGS = -DWHATEVER
-EOF
-
-touch a.c
-
-$ACLOCAL
-$AUTOCONF
-AUTOMAKE_fails --copy --add-missing
-grep '^Makefile\.am:2:.*per-target.*AM_PROG_CC_C_O' stderr
-
-
-cat >Makefile.am <<EOF
-bin_PROGRAMS = wish
-wish_SOURCES = sub/a.c
-EOF
-
-mkdir sub
-mv a.c sub
-
-$AUTOMAKE --copy --add-missing
-
-echo 'AUTOMAKE_OPTIONS = subdir-objects' >> Makefile.am
-AUTOMAKE_fails --copy --add-missing
-grep '^Makefile\.am:2:.*subdir.*AM_PROG_CC_C_O' stderr
-
-:
diff --git a/t/ccnoco3.sh b/t/ccnoco3.sh
index 7ad5b3b..baf3bdf 100755
--- a/t/ccnoco3.sh
+++ b/t/ccnoco3.sh
@@ -16,12 +16,11 @@
# Test to make sure 'compile' doesn't call 'mv SRC SRC'.
-required=gcc
+required=gcc # For cc-no-c-o.
. test-init.sh
cat >> configure.ac << 'END'
AC_PROG_CC
-AM_PROG_CC_C_O
$CC --version; $CC -v; # For debugging.
AC_OUTPUT
END
@@ -43,25 +42,8 @@ int main ()
}
END
-cat > Mycomp << END
-#!/bin/sh
-
-case " \$* " in
- *\ -c*\ -o* | *\ -o*\ -c*)
- exit 1
- ;;
-esac
-
-# Use '$CC', not 'gcc', to honour the compiler chosen
-# by the testsuite setup.
-exec $CC "\$@"
-END
-
-chmod +x Mycomp
-
# Make sure the compiler doesn't understand '-c -o'
-CC=$(pwd)/Mycomp
-export CC
+CC=$am_testaux_builddir/cc-no-c-o; export CC
$ACLOCAL
$AUTOCONF
diff --git a/t/ccnoco4.sh b/t/ccnoco4.sh
index 54b857a..beb02da 100755
--- a/t/ccnoco4.sh
+++ b/t/ccnoco4.sh
@@ -14,17 +14,17 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Check that Automake doesn't pass "-c -o" to losing compiler when
-# the 'subdir-objects' is used but sources are only present in the
-# top-level directory. Reported by Nick Bowler in the discussion on
-# automake bug#13378:
+# Check that Automake-generated C compilation rules don't mistakenly
+# use the "-c -o" options combination unconditionally (even with losing
+# compilers) when the 'subdir-objects' is used but sources are only
+# present in the top-level directory. Reported by Nick Bowler in the
+# discussion on automake bug#13378:
# <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13378#35>
# <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13378#44>
-required=gcc
+required=gcc # For cc-no-c-o.
. test-init.sh
-# We deliberately do not call AM_PROG_CC_C_O here.
cat >> configure.ac << 'END'
AC_PROG_CC
$CC --version; $CC -v; # For debugging.
@@ -39,25 +39,8 @@ END
echo 'int main (void) { return 0; }' > foo.c
-cat > Mycomp << END
-#!/bin/sh
-
-case " \$* " in
- *\ -c*\ -o* | *\ -o*\ -c*)
- exit 1
- ;;
-esac
-
-# Use '$CC', not 'gcc', to honour the compiler chosen
-# by the testsuite setup.
-exec $CC "\$@"
-END
-
-chmod +x Mycomp
-
-# Make sure the compiler doesn't understand '-c -o'.
-CC=$(pwd)/Mycomp
-export CC
+# Make sure the compiler doesn't understand '-c -o'
+CC=$am_testaux_builddir/cc-no-c-o; export CC
$ACLOCAL
$AUTOCONF
diff --git a/t/check8.sh b/t/check8.sh
index a486147..743d1bd 100755
--- a/t/check8.sh
+++ b/t/check8.sh
@@ -22,7 +22,6 @@ required='cc native'
cat >> configure.ac << 'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AC_OUTPUT
END
diff --git a/t/compile4.sh b/t/compile4.sh
index a06aa87..ddabe31 100755
--- a/t/compile4.sh
+++ b/t/compile4.sh
@@ -46,7 +46,6 @@ absmainobj=$cwd/main.obj
cat >> configure.ac << 'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AM_PROG_AR
AC_PROG_RANLIB
AC_CONFIG_FILES([sub/Makefile])
diff --git a/t/cond11.sh b/t/cond11.sh
index 03c4077..7d729d8 100755
--- a/t/cond11.sh
+++ b/t/cond11.sh
@@ -47,7 +47,6 @@ END
: > config.guess
: > config.sub
-: > compile
$ACLOCAL
$AUTOCONF
diff --git a/t/cxx-lt-demo.sh b/t/cxx-lt-demo.sh
index 8afc974..3a87cfd 100755
--- a/t/cxx-lt-demo.sh
+++ b/t/cxx-lt-demo.sh
@@ -94,10 +94,12 @@ $AUTOCONF
$AUTOMAKE --add-missing --copy
ls -l . ax # For debugging.
-for f in ltmain.sh depcomp config.guess config.sub; do
+# Ideally, the 'compile' script should not be required by C++ compilers.
+# But alas, LT_INIT seems to invoke AC_PROG_CC anyway, and that brings in
+# that script.
+for f in ltmain.sh depcomp compile config.guess config.sub; do
test -f ax/$f && test ! -h ax/$f || exit 1
done
-test ! -e ax/compile # Not required by C++ compilers.
cat > src/main.cc << 'END'
#include "libfoo.h++"
diff --git a/t/depcomp8a.sh b/t/depcomp8a.sh
index aa0be39..76aa376 100755
--- a/t/depcomp8a.sh
+++ b/t/depcomp8a.sh
@@ -24,7 +24,6 @@ required=cc
cat >> configure.ac << 'END'
AC_PROG_CC
-#x AM_PROG_CC_C_O
AC_OUTPUT
END
@@ -64,12 +63,9 @@ DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking'
$MAKE distcheck
# Try again with subdir-objects option.
-sed 's/#x //' configure.ac >configure.tmp
-mv -f configure.tmp configure.ac
echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am
-$ACLOCAL
-$AUTOMAKE -a
+$AUTOMAKE
grep include Makefile.in # For debugging.
grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in
diff --git a/t/depcomp8b.sh b/t/depcomp8b.sh
index c2a54da..52382f1 100755
--- a/t/depcomp8b.sh
+++ b/t/depcomp8b.sh
@@ -56,12 +56,9 @@ DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking'
$MAKE distcheck
# Try again with subdir-objects option.
-sed 's/#x //' configure.ac >configure.tmp
-mv -f configure.tmp configure.ac
echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am
-$ACLOCAL
-$AUTOMAKE -a
+$AUTOMAKE
grep include Makefile.in # For debugging.
grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in
diff --git a/t/dist-auxdir-many-subdirs.sh b/t/dist-auxdir-many-subdirs.sh
index d49372a..ec1a964 100755
--- a/t/dist-auxdir-many-subdirs.sh
+++ b/t/dist-auxdir-many-subdirs.sh
@@ -63,6 +63,7 @@ END
required_files='
install-sh
missing
+ compile
depcomp
py-compile
test-driver
diff --git a/t/distcom2.sh b/t/distcom2.sh
index 57154d9..1f39b66 100755
--- a/t/distcom2.sh
+++ b/t/distcom2.sh
@@ -22,7 +22,6 @@
cat >> configure.ac << 'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AC_CONFIG_FILES([subdir/Makefile])
AC_OUTPUT
END
@@ -44,6 +43,8 @@ $ACLOCAL
for opt in '' --no-force; do
+ rm -f compile depcomp
+
$AUTOMAKE $opt --add-missing
test -f compile
@@ -74,7 +75,7 @@ for opt in '' --no-force; do
$FGREP ' $(top_srcdir)/depcomp ' subdir/dc.txt
# The 'compile' script will be listed in the DIST_COMMON of the top-level
- # Makefile because it's required in configure.ac (by AM_PROG_CC_C_O).
+ # Makefile because it's required in configure.ac (by AC_PROG_CC).
$FGREP ' $(top_srcdir)/compile ' dc.txt || $FGREP ' compile ' dc.txt
done
diff --git a/t/dollarvar2.sh b/t/dollarvar2.sh
index 7183743..ef2dd06 100755
--- a/t/dollarvar2.sh
+++ b/t/dollarvar2.sh
@@ -65,27 +65,22 @@ grep 'recursive variable expansion' stderr
cat >Makefile.am <<'EOF'
x = 1
bla = $(foo$(x))
-noinst_PROGRAMS = foo
-foo_CPPFLAGS = -Dwhatever
+oops = $(var-with-dash)
EOF
-echo AC_PROG_CC >> configure.ac
-
-$ACLOCAL --force
-
# Can disable both 'portability' and 'portability-recursive' warnings.
$AUTOMAKE -Wno-portability
# Disabling 'portability-recursive' warnings should not disable
# 'portability' warnings.
AUTOMAKE_fails -Wportability -Wno-portability-recursive
-grep AM_PROG_CC_C_O stderr
+grep 'var-with-dash' stderr
grep 'recursive variable expansion' stderr && exit 1
# Enabling 'portability-recursive' warnings should not enable
# all the 'portability' warning.
AUTOMAKE_fails -Wno-portability -Wportability-recursive
-grep AM_PROG_CC_C_O stderr && exit 1
+grep 'var-with-dash' stderr && exit 1
grep 'recursive variable expansion' stderr
:
diff --git a/t/extra-portability.sh b/t/extra-portability.sh
index 94dd799..1ea23ad 100755
--- a/t/extra-portability.sh
+++ b/t/extra-portability.sh
@@ -62,30 +62,29 @@ $AUTOMAKE -Wall -Wno-portability
# Now, a setup where also a "simple" portability warning is present.
#
-# Per-target flags require the use of AM_PROG_CC_C_O in configure.ac.
-echo libfoo_a_CPPFLAGS = -Dwhatever >> Makefile.am
+echo 'var = $(foo--bar)' >> Makefile.am
# Enabling extra-portability enables portability as well ...
AUTOMAKE_fails -Wextra-portability
-grep 'requires.*AM_PROG_CC_C_O' stderr
+grep 'foo--bar' stderr
grep 'requires.*AM_PROG_AR' stderr
# ... even if it had been previously disabled.
AUTOMAKE_fails -Wno-portability -Wextra-portability
-grep 'requires.*AM_PROG_CC_C_O' stderr
+grep 'foo--bar' stderr
grep 'requires.*AM_PROG_AR' stderr
# Disabling extra-portability leaves portability intact (1).
AUTOMAKE_fails -Wportability -Wno-extra-portability
-grep 'requires.*AM_PROG_CC_C_O' stderr
+grep 'foo--bar' stderr
grep 'requires.*AM_PROG_AR' stderr && exit 1
# Disabling extra-portability leaves portability intact (2).
AUTOMAKE_fails -Wall -Wno-extra-portability
-grep 'requires.*AM_PROG_CC_C_O' stderr
+grep 'foo--bar' stderr
grep 'requires.*AM_PROG_AR' stderr && exit 1
# Enabling portability does not enable extra-portability.
AUTOMAKE_fails -Wportability
-grep 'requires.*AM_PROG_CC_C_O' stderr
+grep 'foo--bar' stderr
grep 'requires.*AM_PROG_AR' stderr && exit 1
# Disabling portability disables extra-portability.
diff --git a/t/instdir-ltlib.sh b/t/instdir-ltlib.sh
index 32d8d40..726f809 100755
--- a/t/instdir-ltlib.sh
+++ b/t/instdir-ltlib.sh
@@ -23,7 +23,6 @@ required='cc libtoolize'
cat >>configure.ac <<'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AM_PROG_AR
AC_PROG_LIBTOOL
AM_PATH_PYTHON
diff --git a/t/instdir-prog.sh b/t/instdir-prog.sh
index 2fa14e5..f916a11 100755
--- a/t/instdir-prog.sh
+++ b/t/instdir-prog.sh
@@ -23,7 +23,6 @@ required=cc
cat >>configure.ac <<'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AM_PROG_AR
AC_PROG_RANLIB
AM_PATH_PYTHON
diff --git a/t/lex-line.sh b/t/lex-line.sh
index d4340e4..9b27c0b 100755
--- a/t/lex-line.sh
+++ b/t/lex-line.sh
@@ -25,7 +25,6 @@ required='cc lex'
cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile])
AC_PROG_CC
-AM_PROG_CC_C_O
AC_PROG_LEX
AC_OUTPUT
END
diff --git a/t/lex-subobj-nodep.sh b/t/lex-subobj-nodep.sh
index 3282350..75e4f0c 100755
--- a/t/lex-subobj-nodep.sh
+++ b/t/lex-subobj-nodep.sh
@@ -22,7 +22,6 @@ required='cc lex'
cat >>configure.ac <<\END
AC_PROG_CC
-AM_PROG_CC_C_O
AC_PROG_LEX
AC_OUTPUT
END
diff --git a/t/lex5.sh b/t/lex5.sh
index 13c8239..232f77d 100755
--- a/t/lex5.sh
+++ b/t/lex5.sh
@@ -21,7 +21,6 @@ required='cc lex'
cat >> configure.ac << 'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AM_PROG_LEX
AC_OUTPUT
END
diff --git a/t/libobj19.sh b/t/libobj19.sh
index fdca575..1a4cf23 100755
--- a/t/libobj19.sh
+++ b/t/libobj19.sh
@@ -22,7 +22,6 @@ required=cc
cat >> configure.ac << 'END'
AC_CONFIG_LIBOBJ_DIR([libobj-dir])
AC_PROG_CC
-AM_PROG_CC_C_O
AM_PROG_AR
AC_PROG_RANLIB
AC_LIBOBJ([foobar])
@@ -55,7 +54,6 @@ extern int dummy;
END
cp "$am_scriptdir/ar-lib" . || fatal_ "fetching auxiliary script 'ar-lib'"
-cp "$am_scriptdir/compile" . || fatal_ "fetching auxiliary script 'compile'"
$ACLOCAL
$AUTOCONF
diff --git a/t/libtool9.sh b/t/libtool9.sh
index 26eb5f1..bb6ac87 100755
--- a/t/libtool9.sh
+++ b/t/libtool9.sh
@@ -24,7 +24,6 @@ required='cc libtoolize'
cat >> configure.ac << 'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AM_PROG_AR
AC_LIBTOOL_DLOPEN
AM_PROG_LIBTOOL
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 92f786a..5cda804 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -30,7 +30,6 @@ t/pm/Version3.pl
XFAIL_TESTS = \
t/all.sh \
-t/ccnoco4.sh \
t/cond17.sh \
t/gcj6.sh \
t/override-conditional-2.sh \
@@ -132,6 +131,7 @@ t/amhello-binpkg.sh \
t/aminit-moreargs-deprecation.sh \
t/amassign.sh \
t/am-config-header-no-more.sh \
+t/am-prog-cc-c-o.sh \
t/am-prog-cc-stdc-no-more.sh \
t/am-prog-mkdir-p-no-more.sh \
t/am-macro-not-found.sh \
@@ -209,7 +209,6 @@ t/canon7.sh \
t/canon8.sh \
t/canon-name.sh \
t/ccnoco.sh \
-t/ccnoco2.sh \
t/ccnoco3.sh \
t/ccnoco4.sh \
t/check.sh \
@@ -954,6 +953,7 @@ t/remake-timing-bug-pr8365.sh \
t/reqd2.sh \
t/repeated-options.sh \
t/rulepat.sh \
+t/self-check-cc-no-c-o.sh \
t/self-check-configure-help.sh \
t/self-check-dir.tap \
t/self-check-exit.tap \
diff --git a/t/per-target-flags.sh b/t/per-target-flags.sh
index ef19e69..d27a244 100755
--- a/t/per-target-flags.sh
+++ b/t/per-target-flags.sh
@@ -26,7 +26,6 @@ AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE([-Wno-extra-portability])
AC_CONFIG_FILES([$makefiles])
AC_PROG_CC
-AM_PROG_CC_C_O
AC_PROG_CXX
AC_PROG_RANLIB
AC_OUTPUT
@@ -55,15 +54,8 @@ cat - libMakefile.am > libMakefile2.am << 'END'
AUTOMAKE_OPTIONS = no-dependencies
END
-# Make sure 'compile' is required.
-for m in $makefiles; do
- AUTOMAKE_fails $m
- $EGREP " required file.* '(compile|\./compile)'" stderr
-done
-
makefiles=$(for mkf in $makefiles; do echo $mkf.in; done)
-: > compile
$AUTOMAKE
# Sanity check.
diff --git a/t/pr224.sh b/t/pr224.sh
index 764d9fb..b6bf6b9 100755
--- a/t/pr224.sh
+++ b/t/pr224.sh
@@ -43,7 +43,6 @@ EOF
cat >>configure.ac <<'EOF'
AC_PROG_CC
-AM_PROG_CC_C_O
AC_OUTPUT
EOF
diff --git a/t/pr401.sh b/t/pr401.sh
index f302042..89094de 100755
--- a/t/pr401.sh
+++ b/t/pr401.sh
@@ -45,7 +45,6 @@ cat >>configure.ac << 'EOF'
## These lines are activated for later tests
#: AC_CONFIG_LIBOBJ_DIR([lib])
AC_PROG_CC
-#x AM_PROG_CC_C_O
AC_LIBOBJ([feep])
AC_LIBSOURCE([feep.c])
AM_PROG_AR
@@ -118,7 +117,7 @@ mv -f src/t src/Makefile.am
## Test using LIBOBJS from a sibling directory. ##
## -------------------------------------------- ##
-sed 's/#x //; s/lib\/Makefile //' configure.ac >configure.tmp
+sed 's/lib\/Makefile //' configure.ac >configure.tmp
mv -f configure.tmp configure.ac
cat >Makefile.am <<'EOF'
diff --git a/t/pr401b.sh b/t/pr401b.sh
index 3fa2ad1..cf7a698 100755
--- a/t/pr401b.sh
+++ b/t/pr401b.sh
@@ -45,7 +45,6 @@ cat >>configure.ac << 'EOF'
## These lines are activated for later tests
#: AC_CONFIG_LIBOBJ_DIR([lib])
AC_PROG_CC
-#x AM_PROG_CC_C_O
AC_LIBOBJ([feep])
AC_LIBSOURCE([feep.c])
AM_PROG_AR
@@ -118,7 +117,7 @@ mv -f src/t src/Makefile.am
## Test using LTLIBOBJS from a sibling directory. ##
## ---------------------------------------------- ##
-sed 's/#x //; s/lib\/Makefile //' configure.ac >configure.tmp
+sed 's/lib\/Makefile //' configure.ac >configure.tmp
mv -f configure.tmp configure.ac
cat >Makefile.am <<'EOF'
diff --git a/t/pr401c.sh b/t/pr401c.sh
index 07c755d..22e5876 100755
--- a/t/pr401c.sh
+++ b/t/pr401c.sh
@@ -47,7 +47,6 @@ cat >>configure.ac << 'EOF'
## These lines are activated for later tests.
#: AC_CONFIG_LIBOBJ_DIR([lib])
AC_PROG_CC
-#x AM_PROG_CC_C_O
AM_PROG_AR
AC_PROG_RANLIB
AC_FUNC_ALLOCA
@@ -120,7 +119,7 @@ mv -f src/t src/Makefile.am
## Test using ALLOCA from a sibling directory. ##
## ------------------------------------------- ##
-sed 's/#x //; s/lib\/Makefile //' configure.ac >configure.tmp
+sed 's/lib\/Makefile //' configure.ac >configure.tmp
mv -f configure.tmp configure.ac
cat >Makefile.am <<'EOF'
diff --git a/t/repeated-options.sh b/t/repeated-options.sh
index af1897b..95963c5 100755
--- a/t/repeated-options.sh
+++ b/t/repeated-options.sh
@@ -24,7 +24,6 @@ cat >configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip no-dist-gzip dist-bzip2])
AC_PROG_CC
-AM_PROG_CC_C_O
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
END
@@ -58,7 +57,7 @@ int main (void)
}
END
-cp "$am_scriptdir"/compile "$am_scriptdir"/test-driver .
+cp "$am_scriptdir"/test-driver .
$ACLOCAL
$AUTOMAKE --foreign --foreign -Wall 2>stderr || { cat stderr >&2; exit 1; }
diff --git a/t/aclocal-no-install-no-mkdir.sh b/t/self-check-cc-no-c-o.sh
similarity index 59%
copy from t/aclocal-no-install-no-mkdir.sh
copy to t/self-check-cc-no-c-o.sh
index 60b43f9..69809b7 100755
--- a/t/aclocal-no-install-no-mkdir.sh
+++ b/t/self-check-cc-no-c-o.sh
@@ -14,23 +14,22 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Check that aclocal does not create a non-existent local m4 directory
-# if the '--install' option is not given.
+# Check that our fake "C compiler" that doesn't grasp the '-c' and
+# '-o' command-line options passed together, used to enhance testsuite
+# coverage.
+required=gcc # Our fake compiler uses gcc.
am_create_testdir=empty
. test-init.sh
-cat > configure.ac <<END
-AC_INIT([$me], [1.0])
-MY_MACRO
-END
+CC=$am_testaux_builddir/cc-no-c-o; export CC
-mkdir sys-acdir
-cat > sys-acdir/my-defs.m4 <<END
-AC_DEFUN([MY_MACRO], [:])
-END
-
-$ACLOCAL -I foo --system-acdir=sys-acdir && exit 1
-test ! -e foo
+echo 'int main (void) { return 0; }' > foo.c
+$CC -c foo.c
+test -f foo.o || test -f foo.obj
+$CC -c -o bar.o foo.c 2>stderr && { cat stderr >&2; exit 1; }
+cat stderr >&2
+grep "both '-o' and '-c' seen on the command line" stderr
+test ! -e bar.o && test ! -e bar.obj
:
diff --git a/t/silent-c.sh b/t/silent-c.sh
index 24af831..28f1667 100755
--- a/t/silent-c.sh
+++ b/t/silent-c.sh
@@ -25,7 +25,6 @@ mkdir sub
cat >>configure.ac <<'EOF'
AC_CONFIG_FILES([sub/Makefile])
AC_PROG_CC
-AM_PROG_CC_C_O
AC_OUTPUT
EOF
diff --git a/t/silent-lex.sh b/t/silent-lex.sh
index 018f8a7..320e91f 100755
--- a/t/silent-lex.sh
+++ b/t/silent-lex.sh
@@ -22,7 +22,6 @@ required='cc lex'
mkdir sub
cat >>configure.ac <<'EOF'
-AM_PROG_CC_C_O
AC_PROG_LEX
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
diff --git a/t/silent-lt.sh b/t/silent-lt.sh
index dc9bf2a..0ae0037 100755
--- a/t/silent-lt.sh
+++ b/t/silent-lt.sh
@@ -26,7 +26,6 @@ cat >>configure.ac <<'EOF'
AC_CONFIG_FILES([sub/Makefile])
AC_PROG_CC
AM_PROG_AR
-AM_PROG_CC_C_O
AC_PROG_LIBTOOL
AC_OUTPUT
EOF
diff --git a/t/silent-many-languages.sh b/t/silent-many-languages.sh
index bffbb6a..5395af6 100755
--- a/t/silent-many-languages.sh
+++ b/t/silent-many-languages.sh
@@ -93,7 +93,6 @@ do_and_check_verbose_build ()
mkdir sub
cat >>configure.ac <<'EOF'
-AM_PROG_CC_C_O
AC_PROG_F77
AC_PROG_FC
AC_PROG_LEX
diff --git a/t/silent-nested-vars.sh b/t/silent-nested-vars.sh
index 7dca056..f03204d 100755
--- a/t/silent-nested-vars.sh
+++ b/t/silent-nested-vars.sh
@@ -22,7 +22,6 @@
cat >>configure.ac <<'EOF'
AM_SILENT_RULES
AC_PROG_CC
-AM_PROG_CC_C_O
AC_OUTPUT
EOF
diff --git a/t/silent-yacc.sh b/t/silent-yacc.sh
index 5017d50..bb21518 100755
--- a/t/silent-yacc.sh
+++ b/t/silent-yacc.sh
@@ -22,7 +22,7 @@ required='cc yacc'
mkdir sub
cat >>configure.ac <<'EOF'
-AM_PROG_CC_C_O
+AC_PROG_CC
AC_PROG_YACC
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
diff --git a/t/specflg-dummy.sh b/t/specflg-dummy.sh
index 89ac206..c1b9cd5 100755
--- a/t/specflg-dummy.sh
+++ b/t/specflg-dummy.sh
@@ -64,7 +64,6 @@ AC_PROG_RANLIB
AC_PROG_LIBTOOL
AM_PROG_UPC
AC_PROG_OBJC
-AM_PROG_CC_C_O
END
cat > Makefile.am <<'END'
diff --git a/t/specflg6.sh b/t/specflg6.sh
index 77d837a..8178b34 100755
--- a/t/specflg6.sh
+++ b/t/specflg6.sh
@@ -22,7 +22,6 @@
cat >> configure.ac << 'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AM_CONDITIONAL([BAR], [true])
END
@@ -36,8 +35,6 @@ foo_CFLAGS = -DFOO
foo_SOURCES = foo.c
END
-: > compile
-
$ACLOCAL
$AUTOMAKE
diff --git a/t/specflg7.sh b/t/specflg7.sh
index ee3786e..0a40b5d 100755
--- a/t/specflg7.sh
+++ b/t/specflg7.sh
@@ -21,7 +21,6 @@ required='cc native'
cat >> configure.ac << 'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AC_OUTPUT
END
diff --git a/t/specflg8.sh b/t/specflg8.sh
index 3bb785b..5e51053 100755
--- a/t/specflg8.sh
+++ b/t/specflg8.sh
@@ -23,7 +23,6 @@ required='cc native'
cat >> configure.ac << 'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AC_OUTPUT
END
diff --git a/t/specflg9.sh b/t/specflg9.sh
index 0ee90f1..3e0c694 100755
--- a/t/specflg9.sh
+++ b/t/specflg9.sh
@@ -20,7 +20,6 @@
cat >> configure.ac << 'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AC_OUTPUT
END
diff --git a/t/subobj-clean-lt-pr10697.sh b/t/subobj-clean-lt-pr10697.sh
index ddcd112..053ce41 100755
--- a/t/subobj-clean-lt-pr10697.sh
+++ b/t/subobj-clean-lt-pr10697.sh
@@ -28,7 +28,6 @@ cat >> configure.ac << 'END'
AM_PROG_AR
AC_PROG_LIBTOOL
AC_PROG_CC
-AM_PROG_CC_C_O
AC_OUTPUT
END
diff --git a/t/subobj-clean-pr10697.sh b/t/subobj-clean-pr10697.sh
index df97f07..e244e3d 100755
--- a/t/subobj-clean-pr10697.sh
+++ b/t/subobj-clean-pr10697.sh
@@ -26,7 +26,6 @@ required=cc
cat >> configure.ac << 'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AC_CONFIG_FILES([get-objext.sh:get-objext.in])
AC_OUTPUT
END
diff --git a/t/subobj.sh b/t/subobj.sh
index 2431184..d16512a 100755
--- a/t/subobj.sh
+++ b/t/subobj.sh
@@ -18,10 +18,7 @@
. test-init.sh
-cat >> configure.ac << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-END
+echo AC_PROG_CC >> configure.ac
cat > Makefile.am << 'END'
AUTOMAKE_OPTIONS = subdir-objects
@@ -30,10 +27,11 @@ wish_SOURCES = generic/a.c generic/b.c
END
$ACLOCAL
+rm -f compile
$AUTOMAKE --add-missing 2>stderr || { cat stderr >&2; exit 1; }
cat stderr >&2
# Make sure compile is installed, and that Automake says so.
-grep 'install.*compile' stderr
+grep '^configure\.ac:4:.*install.*compile' stderr
test -f compile
grep '^generic/a\.\$(OBJEXT):' Makefile.in
diff --git a/t/subobj11a.sh b/t/subobj11a.sh
index 78e0b3b..15c7042 100755
--- a/t/subobj11a.sh
+++ b/t/subobj11a.sh
@@ -31,7 +31,6 @@ required=cc
cat >> configure.ac << 'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AC_OUTPUT
END
diff --git a/t/subobj11b.sh b/t/subobj11b.sh
index 14970a0..deaa2b6 100755
--- a/t/subobj11b.sh
+++ b/t/subobj11b.sh
@@ -28,10 +28,7 @@
. test-init.sh
-cat >> configure.ac << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-END
+echo AC_PROG_CC >> configure.ac
cat > Makefile.am << 'END'
AUTOMAKE_OPTIONS = subdir-objects
diff --git a/t/subobj11c.sh b/t/subobj11c.sh
index a8a435b..7476e47 100755
--- a/t/subobj11c.sh
+++ b/t/subobj11c.sh
@@ -21,10 +21,7 @@
. test-init.sh
-cat >> configure.ac << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-END
+echo AC_PROG_CC >> configure.ac
cat > Makefile.am << 'END'
AUTOMAKE_OPTIONS = subdir-objects
diff --git a/t/subobj4.sh b/t/subobj4.sh
index b1b577d..816f506 100755
--- a/t/subobj4.sh
+++ b/t/subobj4.sh
@@ -21,7 +21,6 @@
cat >> configure.ac << 'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AC_PROG_CXX
AC_CONFIG_FILES([d1/Makefile d2/Makefile])
AC_OUTPUT
@@ -41,7 +40,6 @@ END
cat > d2/Makefile.am << 'END'
END
-: > compile
: > d2/z.c
$ACLOCAL
diff --git a/t/subobj5.sh b/t/subobj5.sh
index 5482304..4851423 100755
--- a/t/subobj5.sh
+++ b/t/subobj5.sh
@@ -23,7 +23,6 @@ required=cc
cat >> configure.ac << 'END'
AC_CONFIG_FILES([generic/Makefile])
AC_PROG_CC
-AM_PROG_CC_C_O
AC_OUTPUT
END
diff --git a/t/subobj6.sh b/t/subobj6.sh
index 71755fd..0e7aa86 100755
--- a/t/subobj6.sh
+++ b/t/subobj6.sh
@@ -21,7 +21,7 @@ required=cc
. test-init.sh
cat >> configure.ac << 'END'
-AM_PROG_CC_C_O
+AC_PROG_CC
AC_OUTPUT
END
diff --git a/t/subobj7.sh b/t/subobj7.sh
index 2d997c7..5dc9ea8 100755
--- a/t/subobj7.sh
+++ b/t/subobj7.sh
@@ -21,7 +21,6 @@
cat >> configure.ac << 'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AC_OUTPUT
END
diff --git a/t/subobj8.sh b/t/subobj8.sh
index 51e1727..dd03008 100755
--- a/t/subobj8.sh
+++ b/t/subobj8.sh
@@ -23,7 +23,6 @@ AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([tools])
AM_INIT_AUTOMAKE
AC_PROG_CC
-AM_PROG_CC_C_O
AC_CONFIG_FILES([Makefile foo/Makefile])
AC_OUTPUT
END
diff --git a/t/suffix-custom-subobj-and-specflg.sh
b/t/suffix-custom-subobj-and-specflg.sh
index e9f35c7..32356d7 100755
--- a/t/suffix-custom-subobj-and-specflg.sh
+++ b/t/suffix-custom-subobj-and-specflg.sh
@@ -23,7 +23,6 @@ required=cc
cat >>configure.ac <<EOF
AC_PROG_CC
-AM_PROG_CC_C_O
AC_OUTPUT
EOF
diff --git a/t/target-cflags.sh b/t/target-cflags.sh
index 3c7d720..01bcbce 100755
--- a/t/target-cflags.sh
+++ b/t/target-cflags.sh
@@ -22,7 +22,6 @@ required=cc
cat >> configure.ac << 'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AC_OUTPUT
END
diff --git a/t/txinfo-builddir.sh b/t/txinfo-builddir.sh
index 148a1a6..e0156c5 100755
--- a/t/txinfo-builddir.sh
+++ b/t/txinfo-builddir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2012-2013 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
diff --git a/t/vala-libs.sh b/t/vala-libs.sh
index f3e9054..66fd243 100755
--- a/t/vala-libs.sh
+++ b/t/vala-libs.sh
@@ -22,7 +22,6 @@ required="valac cc pkg-config libtoolize GNUmake"
cat >> configure.ac << 'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AM_PROG_AR
AC_PROG_RANLIB
AC_PROG_LIBTOOL
diff --git a/t/vala-mix.sh b/t/vala-mix.sh
index 7b7403d..1ac851e 100755
--- a/t/vala-mix.sh
+++ b/t/vala-mix.sh
@@ -21,7 +21,6 @@ required='valac cc pkg-config GNUmake'
cat >> configure.ac <<'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AM_PROG_VALAC([0.7.3])
PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
AC_OUTPUT
diff --git a/t/vala-non-recursive-setup.sh b/t/vala-non-recursive-setup.sh
index ca65a4f..88d9d33 100755
--- a/t/vala-non-recursive-setup.sh
+++ b/t/vala-non-recursive-setup.sh
@@ -23,7 +23,6 @@ mkdir src
cat >> 'configure.ac' << 'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AM_PROG_VALAC([0.7.0])
PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
AC_OUTPUT
diff --git a/t/vala-per-target-flags.sh b/t/vala-per-target-flags.sh
index 3461365..add07cf 100755
--- a/t/vala-per-target-flags.sh
+++ b/t/vala-per-target-flags.sh
@@ -23,7 +23,6 @@ mkdir src
cat >> configure.ac <<'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AM_PROG_VALAC([0.7.0])
PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
AC_CONFIG_FILES([src/Makefile])
diff --git a/t/vala-recursive-setup.sh b/t/vala-recursive-setup.sh
index 5c1f4c6..cf7980d 100755
--- a/t/vala-recursive-setup.sh
+++ b/t/vala-recursive-setup.sh
@@ -23,7 +23,6 @@ mkdir src
cat >> 'configure.ac' << 'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AM_PROG_VALAC([0.7.0])
PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
AC_CONFIG_FILES([src/Makefile])
diff --git a/t/vala-vapi.sh b/t/vala-vapi.sh
index 9def253..ce5ca9d 100755
--- a/t/vala-vapi.sh
+++ b/t/vala-vapi.sh
@@ -21,7 +21,6 @@ required='pkg-config valac cc GNUmake'
cat >> configure.ac <<'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AM_PROG_VALAC([0.7.3])
PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
AC_OUTPUT
diff --git a/t/yacc-dist-nobuild-subdir.sh b/t/yacc-dist-nobuild-subdir.sh
index 7ea2528..8b7f7ff 100755
--- a/t/yacc-dist-nobuild-subdir.sh
+++ b/t/yacc-dist-nobuild-subdir.sh
@@ -27,7 +27,6 @@ useless_vpath_rebuild && skip_ "would trip on automake
bug#7884"
cat >> configure.ac << 'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AC_PROG_YACC
AC_OUTPUT
END
diff --git a/t/yacc-grepping2.sh b/t/yacc-grepping2.sh
index 9f20798..58a963c 100755
--- a/t/yacc-grepping2.sh
+++ b/t/yacc-grepping2.sh
@@ -21,7 +21,6 @@
cat >> configure.ac << 'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AC_PROG_YACC
END
diff --git a/t/yacc-line.sh b/t/yacc-line.sh
index ed30c56..9067a2d 100755
--- a/t/yacc-line.sh
+++ b/t/yacc-line.sh
@@ -25,7 +25,6 @@ required='cc yacc'
cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile])
AC_PROG_CC
-AM_PROG_CC_C_O
AC_PROG_YACC
AC_OUTPUT
END
diff --git a/t/yacc-subdir.sh b/t/yacc-subdir.sh
index 9db4921..95788ec 100755
--- a/t/yacc-subdir.sh
+++ b/t/yacc-subdir.sh
@@ -22,7 +22,6 @@ required='cc yacc'
cat >> configure.ac << 'END'
AC_PROG_CC
-AM_PROG_CC_C_O
AC_PROG_YACC
AC_OUTPUT
END
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.13.1-102-g84d77cd,
Stefano Lattarini <=