From: Stefano Lattarini Date: Fri, 30 Nov 2012 10:54:52 +0000 (+0100) Subject: Merge branch 'master' into ng/master X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3ee1c82b519f4ad3c98ddfdfdb0332f54c9d902;p=thirdparty%2Fautomake.git Merge branch 'master' into ng/master * master: (30 commits) news: we'll remove AM_PROG_MKDIR in 1.14, not 1.13 tests: give few vala tests more significant names vala tests: don't use the 'posix' profile, it's no longer supported news: fixup: bug#8847 is fixed in 1.12.6, not in 1.12.5 news: document the fix for automake bug#10227 tests: fix a spurious testsuite failure on Solaris tests: give few aclocal tests more significant names tests: remove a redundant workaround for a testsuite weakness depcomp: remove 'icc' depmode, add 'tcc' one news: update w.r.t. recent depcomp changes tests: fix spurious failures with tcc depcomp: improve comments about tcc support depcomp: remove last relics of libtool 1.4 support depcomp: remove an unused variable depcomp: rewrite a sed invocation for less quoting depcomp: whitespace fixes depcomp: shell code style changes depcomp: make some code more self-documenting depcomp: less duplication between AIX and Tru64 modes depcomp: avoid an extra fork when possible ... Signed-off-by: Stefano Lattarini --- a3ee1c82b519f4ad3c98ddfdfdb0332f54c9d902 diff --cc lib/depcomp index b2d236788,3f02f5d00..f6d7ed0f0 --- a/lib/depcomp +++ b/lib/depcomp @@@ -60,9 -109,15 +108,15 @@@ tab=' # A newline character. nl=' ' + # Character ranges might be problematic outside the C locale. + # These definitions help. + upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ + lower=abcdefghijklmnopqrstuvwxyz + digits=0123456789 + alpha=${upper}${lower} -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 +if test -z "$depmode" || test -z "$object"; then + echo "depcomp: Variables object and depmode must be set" 1>&2 exit 1 fi diff --cc t/depcomp8a.sh index bbb8e75e5,3d58a3eeb..8ec261a7c --- a/t/depcomp8a.sh +++ b/t/depcomp8a.sh @@@ -42,9 -42,32 +42,12 @@@ int main (void } END cat > sub/bar.c << 'END' - extern int bar = 0; + int bar (void) + { + return 0; + } END -$ACLOCAL -$AUTOMAKE -a -grep include Makefile.in # For debugging. -grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in -grep 'include.*\./\$(DEPDIR)/bar\.P' Makefile.in -grep 'include.*/\./\$(DEPDIR)' Makefile.in && exit 1 - -$AUTOCONF -# Don't reject slower dependency extractors, for better coverage. -./configure --enable-dependency-tracking -$MAKE -cross_compiling || ./zardoz -DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck - -# Try again with subdir-objects option. - -sed 's/#x //' configure.ac >configure.int -mv -f configure.int configure.ac -echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am - $ACLOCAL $AUTOMAKE -a grep include Makefile.in # For debugging. diff --cc t/depcomp8b.sh index 32aa81b48,6fed2155c..d25dc6be4 --- a/t/depcomp8b.sh +++ b/t/depcomp8b.sh @@@ -36,10 -36,30 +36,10 @@@ libzardoz_la_SOURCES = foo.c sub/bar. END mkdir sub - echo 'extern int foo = 0;' > foo.c - echo 'extern int bar = 0;' > sub/bar.c + echo 'int foo (void) { return 0; }' > foo.c + echo 'int bar (void) { return 0; }' > sub/bar.c libtoolize - -$ACLOCAL -$AUTOMAKE -a -grep include Makefile.in # For debugging. -grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in -grep 'include.*\./\$(DEPDIR)/bar\.P' Makefile.in -grep 'include.*/\./\$(DEPDIR)' Makefile.in && exit 1 - -$AUTOCONF -# Don't reject slower dependency extractors, for better coverage. -./configure --enable-dependency-tracking -$MAKE -DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck - -# Try again with subdir-objects option. - -sed 's/#x //' configure.ac >configure.int -mv -f configure.int configure.ac -echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am - $ACLOCAL $AUTOMAKE -a grep include Makefile.in # For debugging. diff --cc t/vala-mix.sh index 274d50678,44b5a3b5a..2aacc7774 --- a/t/vala-mix.sh +++ b/t/vala-mix.sh @@@ -16,7 -16,7 +16,7 @@@ # Vala sources and C sources in the same program. Functional test. - required='valac cc' -required='valac cc pkg-config GNUmake' ++required='valac cc pkg-config' . test-init.sh cat >> configure.ac <<'END' diff --cc t/vala-mix2.sh index 753a5d144,3e823e243..d914884e6 --- a/t/vala-mix2.sh +++ b/t/vala-mix2.sh @@@ -17,7 -17,7 +17,7 @@@ # Vala sources, C and C++ sources and C and C++ headers in the same # program. Functional test. See automake bug#10894. - required='valac cc c++' -required='valac cc c++ pkg-config GNUmake' ++required='valac cc c++ pkg-config' . test-init.sh cat >> configure.ac <<'END' diff --cc t/vala-non-recursive-setup.sh index b3712e9e1,96135d34e..d92e83305 --- a/t/vala-non-recursive-setup.sh +++ b/t/vala-non-recursive-setup.sh @@@ -16,7 -16,7 +16,7 @@@ # Test to make sure compiling Vala code really works with non-recursive make. - required="pkg-config valac gcc" -required="pkg-config valac gcc GNUmake" ++required='valac gcc pkg-config' . test-init.sh mkdir src diff --cc t/vala-parallel.sh index 19b5570a3,b68d76229..650dc4463 --- a/t/vala-parallel.sh +++ b/t/vala-parallel.sh @@@ -16,7 -16,7 +16,7 @@@ # Vala support with parallel make. - required='valac cc' -required='valac cc pkg-config GNUmake' ++required='valac cc pkg-config' . test-init.sh cat >> configure.ac <<'END' diff --cc t/vala-per-target-flags.sh index 94ae7aa01,5eae28185..dbc4f0937 --- a/t/vala-per-target-flags.sh +++ b/t/vala-per-target-flags.sh @@@ -14,9 -14,9 +14,9 @@@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . - # Test per-target flags. + # Test per-target flags in vala support. -required="pkg-config valac gcc GNUmake" +required="pkg-config valac gcc" . test-init.sh mkdir src diff --cc t/vala-vapi.sh index 66d033ed7,545a0ea01..5c2f9f73e --- a/t/vala-vapi.sh +++ b/t/vala-vapi.sh @@@ -16,7 -16,7 +16,7 @@@ # Test and that vapi files are correctly handled by Vala support. - required='valac cc' -required='pkg-config valac cc GNUmake' ++required='valac cc pkg-config' . test-init.sh cat >> configure.ac <<'END' diff --cc t/vala-vpath.sh index ad5acf680,7e2a984a7..a0df38847 --- a/t/vala-vpath.sh +++ b/t/vala-vpath.sh @@@ -17,7 -17,7 +17,7 @@@ # Test to make sure vala support handles from-scratch VPATH builds. # See automake bug#8753. - required="cc valac" -required="cc valac pkg-config GNUmake" ++required='cc valac pkg-config' . test-init.sh cat >> configure.ac << 'END'