[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.3-823-g6bdbca3

[Stefano Lattarini]

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=6bdbca382bfdea2304ef3947c805c9004b096b39

The branch, ng/master has been updated
       via  6bdbca382bfdea2304ef3947c805c9004b096b39 (commit)
       via  c4f86d620eb56586b9d0036d051d6e3ca88babf8 (commit)
       via  0af298adbfea3e9eb5938772c7c8b38926034126 (commit)
       via  23a4376fc462bbe0e36b5515671724b7e3d89fb9 (commit)
       via  cb60ae36f86e0d3bb1a879fda60ef925a8316c6c (commit)
       via  d343f7af1481ecb017dbf2aefd7b7c66622d2d33 (commit)
       via  4be30e9667936729218aa80b6b916ea31fcf92a3 (commit)
       via  c433a17c5439982cc441226be61b6692543407ec (commit)
      from  f75d44b7ade944067ce1ef3abda0fb87616d7131 (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 6bdbca382bfdea2304ef3947c805c9004b096b39
Author: Stefano Lattarini <address@hidden>
Date:   Tue Aug 28 11:58:59 2012 +0200

    maintcheck: fix some minor failures
    
    * t/lisp-flags.sh: Avoid use of brittle "make -e".
    * Makefile.am (perf): Don't use $(AM_MAKEFLAGS) when invoking make
    recursively.
    * t/dist-obsolete-opts.sh: Make executable.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit c4f86d620eb56586b9d0036d051d6e3ca88babf8
Author: Stefano Lattarini <address@hidden>
Date:   Tue Aug 28 11:52:45 2012 +0200

    tests: fix spurious failure in test on Flex headers
    
    * t/lex-headers.sh: Don't use 'yl_distcheck', simply call "make distcheck"
    instead, as GNU make cannot suffer of the FreeBSD bug 'yl_distcheck' was
    meant to guard against.
    (Makefile.am): Don't use $(AM_MAKEFLAGS) when invoking make recursively.
    This avoids a maintainer-check failure.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 0af298adbfea3e9eb5938772c7c8b38926034126
Merge: f75d44b 23a4376
Author: Stefano Lattarini <address@hidden>
Date:   Tue Aug 28 11:08:05 2012 +0200

    Merge branch 'master' into ng/master
    
    * master:
      tests: fix a maintainer-check failure ('Exit' used instead of 'exit')
      sync: update files from upstream with "make fetch"
      automake: don't define many identical 'lang_*_rewrite' subroutines
      coverage: bugs #8844 and #9933 (already fixed by Akim's work on ylwrap)
    
    Signed-off-by: Stefano Lattarini <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am                          |    4 +-
 lib/config.guess                     |    5 +++-
 lib/config.sub                       |    6 ++--
 t/{lex-noyywrap.sh => lex-header.sh} |   35 ++++++++++++++++++++++-----------
 t/lisp-flags.sh                      |    2 +-
 t/lisp-loadpath.sh                   |    2 +-
 6 files changed, 34 insertions(+), 20 deletions(-)
 mode change 100644 => 100755 t/dist-obsolete-opts.sh
 copy t/{lex-noyywrap.sh => lex-header.sh} (69%)

diff --git a/Makefile.am b/Makefile.am
index 9455f0f..656ebac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -500,8 +500,8 @@ perf_TESTS = $(wildcard $(srcdir)/t/perf/*.sh) \
              $(wildcard $(srcdir)/t/perf/*.tap)
 .PHONY: perf
 perf: all
-       $(MAKE) $(AM_MAKEFLAGS) TEST_SUITE_LOG='$(PERF_TEST_SUITE_LOG)' \
-                               TESTS='$(perf_TESTS)' check
+       $(MAKE) TEST_SUITE_LOG='$(PERF_TEST_SUITE_LOG)' \
+               TESTS='$(perf_TESTS)' check
 PERF_TEST_SUITE_LOG = t/perf/test-suite.log
 CLEANFILES += $(PERF_TEST_SUITE_LOG)
 EXTRA_DIST += $(perf_TESTS)
diff --git a/lib/config.guess b/lib/config.guess
index ad5f74a..137bedf 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 Free Software Foundation, Inc.
 
-timestamp='2012-07-31'
+timestamp='2012-08-14'
 
 # 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
@@ -1208,6 +1208,9 @@ EOF
     BePC:Haiku:*:*)    # Haiku running on Intel PC compatible.
        echo i586-pc-haiku
        exit ;;
+    x86_64:Haiku:*:*)
+       echo x86_64-unknown-haiku
+       exit ;;
     SX-4:SUPER-UX:*:*)
        echo sx4-nec-superux${UNAME_RELEASE}
        exit ;;
diff --git a/lib/config.sub b/lib/config.sub
index b15df57..bdda9e4 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 Free Software Foundation, Inc.
 
-timestamp='2012-07-31'
+timestamp='2012-08-18'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -123,7 +123,7 @@ esac
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | 
kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
@@ -1364,7 +1364,7 @@ case $os in
              | -chorusos* | -chorusrdb* | -cegcc* \
              | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* 
\
              | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-             | -linux-newlib* | -linux-uclibc* \
+             | -linux-newlib* | -linux-musl* | -linux-uclibc* \
              | -uxpv* | -beos* | -mpeix* | -udk* \
              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
diff --git a/t/dist-obsolete-opts.sh b/t/dist-obsolete-opts.sh
old mode 100644
new mode 100755
diff --git a/t/lex-noyywrap.sh b/t/lex-header.sh
similarity index 69%
copy from t/lex-noyywrap.sh
copy to t/lex-header.sh
index 335ed00..a0a57df 100755
--- a/t/lex-noyywrap.sh
+++ b/t/lex-header.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,28 +14,30 @@
 # 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 Lex support with flex using the '%noyywrap' option.
+# Automake lex support can work with flex '--header-file' option (see
+# bugs #8844 and #9933).
 
 required='cc flex'
 . ./defs || exit 1
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_LEX
+AC_PROG_LEX
 AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
 bin_PROGRAMS = foo
-foo_SOURCES = foo.l
-
-.PHONY: test-no-lexlib
-check-local: test-no-lexlib
-test-no-lexlib:
-       test x'$(LEXLIB)' = x'none needed'
+foo_SOURCES = lexer.l main.c mylex.h
+foo_LFLAGS = --header-file=mylex.h
+BUILT_SOURCES = mylex.h
+# Recover from removal of header.
+mylex.h: foo-lexer.c
+       test -f $@ || rm -f foo-lexer.c
+       test -f $@ || $(MAKE) foo-lexer.c
 END
 
-cat > foo.l << 'END'
+cat > lexer.l << 'END'
 %option noyywrap
 %{
 #define YY_NO_UNISTD_H 1
@@ -44,6 +46,10 @@ cat > foo.l << 'END'
 "GOOD"   return EOF;
 .
 %%
+END
+
+cat > main.c <<'END'
+#include "mylex.h"
 int main (void)
 {
   /* We don't use a 'while' loop here (like a real lexer would do)
@@ -59,7 +65,7 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a
 
-./configure LEXLIB="none needed"
+./configure
 
 # Program should build and run.
 $MAKE
@@ -69,7 +75,12 @@ if ! cross_compiling; then
   : For shells with busted 'set -e'.
 fi
 
+# Recovering from header removal.
+rm -f mylex.h
+$MAKE
+test -f mylex.h
+
 # Sanity check on distribution.
-$MAKE distcheck DISTCHECK_CONFIGURE_FLAGS='LEXLIB="none needed"'
+$MAKE distcheck
 
 :
diff --git a/t/lisp-flags.sh b/t/lisp-flags.sh
index 1d7d8f3..64cb3c9 100755
--- a/t/lisp-flags.sh
+++ b/t/lisp-flags.sh
@@ -35,7 +35,7 @@ $AUTOMAKE --add-missing
 ./configure EMACS='echo >$@' --with-lispdir="$(pwd)/unused"
 
 : > foo.el
-ELCFLAGS='__usr_elcflags__' $MAKE -e
+$MAKE ELCFLAGS=__usr_elcflags__
 grep '__am_elcflags__.*__usr_elcflags__' foo.elc
 
 :
diff --git a/t/lisp-loadpath.sh b/t/lisp-loadpath.sh
index 50748ce..e0f21ce 100755
--- a/t/lisp-loadpath.sh
+++ b/t/lisp-loadpath.sh
@@ -55,7 +55,7 @@ test ! -e foo.elc
 # stuff in the srcdir.
 echo "(provide" > ../foo.el  # Break it.
 echo "defun)" > ../bar.el    # Likewise.
-$MAKE && Exit 1
+$MAKE && exit 1
 $sleep
 echo "(provide 'foo)" > foo.el
 echo "(provide 'bar)" > bar.el


hooks/post-receive
-- 
GNU Automake