[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.3-153-g23a4376

[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=23a4376fc462bbe0e36b5515671724b7e3d89fb9

The branch, master has been updated
       via  23a4376fc462bbe0e36b5515671724b7e3d89fb9 (commit)
       via  cb60ae36f86e0d3bb1a879fda60ef925a8316c6c (commit)
       via  d343f7af1481ecb017dbf2aefd7b7c66622d2d33 (commit)
       via  4be30e9667936729218aa80b6b916ea31fcf92a3 (commit)
       via  c433a17c5439982cc441226be61b6692543407ec (commit)
      from  9799821061b9f4bf6c6e4e4384c633b5fcb0fe97 (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 23a4376fc462bbe0e36b5515671724b7e3d89fb9
Author: Stefano Lattarini <address@hidden>
Date:   Tue Aug 28 10:58:37 2012 +0200

    tests: fix a maintainer-check failure ('Exit' used instead of 'exit')
    
    * t/lisp-loadpath.sh: Here.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit cb60ae36f86e0d3bb1a879fda60ef925a8316c6c
Merge: 9799821 d343f7a
Author: Stefano Lattarini <address@hidden>
Date:   Tue Aug 28 10:00:45 2012 +0200

    Merge branch 'maint'
    
    * maint:
      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)

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

Summary of changes:
 automake.in                          |   93 ++--------------------------------
 lib/config.guess                     |    5 ++-
 lib/config.sub                       |    6 +-
 t/{lex-noyywrap.sh => lex-header.sh} |   35 ++++++++----
 t/lisp-loadpath.sh                   |    2 +-
 t/list-of-tests.mk                   |    1 +
 6 files changed, 37 insertions(+), 105 deletions(-)
 copy t/{lex-noyywrap.sh => lex-header.sh} (69%)

diff --git a/automake.in b/automake.in
index 95ecbef..b165855 100644
--- a/automake.in
+++ b/automake.in
@@ -1740,6 +1740,7 @@ sub handle_single_transform ($$$$$%)
            # generates another source file which we must then process
            # further.
            my $subr = \&{'lang_' . $lang->name . '_rewrite'};
+           defined &$subr or $subr = \&lang_sub_obj;
            my ($r, $source_extension)
                = &$subr ($directory, $base, $extension,
                          $obj, $have_per_exec_flags, $var);
@@ -5589,12 +5590,6 @@ sub lang_c_rewrite
     return $r;
 }
 
-# Rewrite a single C++ source file.
-sub lang_cxx_rewrite
-{
-    return &lang_sub_obj;
-}
-
 # Rewrite a single header file.
 sub lang_header_rewrite
 {
@@ -5611,7 +5606,7 @@ sub lang_vala_rewrite
     return (LANG_SUBDIR, $newext);
 }
 
-# Rewrite a single yacc file.
+# Rewrite a single yacc/yacc++ file.
 sub lang_yacc_rewrite
 {
     my ($directory, $base, $ext) = @_;
@@ -5620,18 +5615,9 @@ sub lang_yacc_rewrite
     (my $newext = $ext) =~ tr/y/c/;
     return ($r, $newext);
 }
+sub lang_yaccxx_rewrite { lang_yacc_rewrite (@_); };
 
-# Rewrite a single yacc++ file.
-sub lang_yaccxx_rewrite
-{
-    my ($directory, $base, $ext) = @_;
-
-    my $r = &lang_sub_obj;
-    (my $newext = $ext) =~ tr/y/c/;
-    return ($r, $newext);
-}
-
-# Rewrite a single lex file.
+# Rewrite a single lex/lex++ file.
 sub lang_lex_rewrite
 {
     my ($directory, $base, $ext) = @_;
@@ -5640,76 +5626,7 @@ sub lang_lex_rewrite
     (my $newext = $ext) =~ tr/l/c/;
     return ($r, $newext);
 }
-
-# Rewrite a single lex++ file.
-sub lang_lexxx_rewrite
-{
-    my ($directory, $base, $ext) = @_;
-
-    my $r = &lang_sub_obj;
-    (my $newext = $ext) =~ tr/l/c/;
-    return ($r, $newext);
-}
-
-# Rewrite a single assembly file.
-sub lang_asm_rewrite
-{
-    return &lang_sub_obj;
-}
-
-# Rewrite a single preprocessed assembly file.
-sub lang_cppasm_rewrite
-{
-    return &lang_sub_obj;
-}
-
-# Rewrite a single Fortran 77 file.
-sub lang_f77_rewrite
-{
-    return &lang_sub_obj;
-}
-
-# Rewrite a single Fortran file.
-sub lang_fc_rewrite
-{
-    return &lang_sub_obj;
-}
-
-# Rewrite a single preprocessed Fortran file.
-sub lang_ppfc_rewrite
-{
-    return &lang_sub_obj;
-}
-
-# Rewrite a single preprocessed Fortran 77 file.
-sub lang_ppf77_rewrite
-{
-    return &lang_sub_obj;
-}
-
-# Rewrite a single ratfor file.
-sub lang_ratfor_rewrite
-{
-    return &lang_sub_obj;
-}
-
-# Rewrite a single Objective C file.
-sub lang_objc_rewrite
-{
-    return &lang_sub_obj;
-}
-
-# Rewrite a single Objective C++ file.
-sub lang_objcxx_rewrite
-{
-    return &lang_sub_obj;
-}
-
-# Rewrite a single Unified Parallel C file.
-sub lang_upc_rewrite
-{
-    return &lang_sub_obj;
-}
+sub lang_lexxx_rewrite { lang_lex_rewrite (@_); };
 
 # Rewrite a single Java file.
 sub lang_java_rewrite
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/lex-noyywrap.sh b/t/lex-header.sh
similarity index 69%
copy from t/lex-noyywrap.sh
copy to t/lex-header.sh
index c4c4964..f8d7333 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) $(AM_MAKEFLAGS) 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.
-yl_distcheck DISTCHECK_CONFIGURE_FLAGS='LEXLIB="none needed"'
+yl_distcheck
 
 :
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
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 2706e95..cb6d445 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -562,6 +562,7 @@ t/lex5.sh \
 t/lexcpp.sh \
 t/lexvpath.sh \
 t/lex-subobj-nodep.sh \
+t/lex-header.sh \
 t/lex-lib.sh \
 t/lex-lib-external.sh \
 t/lex-libobj.sh \


hooks/post-receive
-- 
GNU Automake