[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.4-234-g1efb88c

[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=1efb88cadad61a031d1c297310bc2634562f2e87

The branch, master has been updated
       via  1efb88cadad61a031d1c297310bc2634562f2e87 (commit)
       via  b1e58545f392151970f930be4c89b75b47c087a5 (commit)
       via  b1a0ec539943d176a21b647c63a7d36921d63c13 (commit)
       via  eff0e07327d9c37bbda3e2ea385f33d1e9ec9f5b (commit)
       via  4872dfe765470157af6276f7e9bd8c5d3f0e34eb (commit)
       via  e0a0fbf00414e26bf9869c2d82177fd9426887b2 (commit)
       via  db036841cca7c784033ee624c7a8b261f25a76ed (commit)
      from  92bd5d25c2ba94b8664202990d0152e68d440632 (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 1efb88cadad61a031d1c297310bc2634562f2e87
Merge: 92bd5d2 b1e5854
Author: Stefano Lattarini <address@hidden>
Date:   Fri Nov 16 14:50:02 2012 +0100

    Merge branch 'maint'
    
    * maint:
      maintcheck: avoid failures, sync with 'ng/master' more
      maintcheck: remove 'sc_perl_syntax'
      sync: update files from upstream with "make fetch"
      maint: get rid of $perllibdir environment variable hack
      configure: respect the '-q' option better
      cosmetics: de-tabify configure.ac
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 NEWS               |    6 ++++++
 aclocal.in         |    5 +++--
 automake.in        |    5 +++--
 configure.ac       |   17 +++++++++--------
 lib/config.sub     |    6 ++++--
 lib/texinfo.tex    |   37 ++++++++++++++++++++++++++++---------
 syntax-checks.mk   |   44 +++++++++++++++++++++-----------------------
 t/wrap/aclocal.in  |    6 ++----
 t/wrap/automake.in |    6 ++----
 9 files changed, 78 insertions(+), 54 deletions(-)

diff --git a/NEWS b/NEWS
index 7fa94d0..4ad5ce3 100644
--- a/NEWS
+++ b/NEWS
@@ -237,6 +237,12 @@ New in 1.12.5:
     the error possibly going unnoticed or triggering harder-to-diagnose
     fallout failures in later steps.
 
+* Miscellaneous changes:
+
+  - automake and aclocal no longer honours the 'perllibdir' environment
+    variable.  That had always been intended only as an hack required in
+    the testsuite, not meant for any use beyond that.
+
 Bugs fixed in 1.12.5:
 
 * Long-standing bugs:
diff --git a/aclocal.in b/aclocal.in
index 76b556a..05b89e7 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -27,8 +27,9 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S 
"$0" "$@";; esac'
 
 BEGIN
 {
-  my $perllibdir = $ENV{'perllibdir'} || 
'@datadir@/@address@hidden@APIVERSION@';
-  unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
+  @Aclocal::perl_libdirs = ('@datadir@/@address@hidden@APIVERSION@')
+    unless @Aclocal::perl_libdirs;
+  unshift @INC, @Aclocal::perl_libdirs;
 }
 
 use strict;
diff --git a/automake.in b/automake.in
index 3a401d8..3194c99 100644
--- a/automake.in
+++ b/automake.in
@@ -29,8 +29,9 @@ package Language;
 
 BEGIN
 {
-  my $perllibdir = $ENV{'perllibdir'} || 
'@datadir@/@address@hidden@APIVERSION@';
-  unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
+  @Automake::perl_libdirs = ('@datadir@/@address@hidden@APIVERSION@')
+    unless @Automake::perl_libdirs;
+  unshift @INC, @Automake::perl_libdirs;
 
   # Override SHELL.  This is required on DJGPP so that system() uses
   # bash, not COMMAND.COM which doesn't quote arguments properly.
diff --git a/configure.ac b/configure.ac
index 90985da..00ccc1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,11 +95,11 @@ AC_CACHE_CHECK([whether $PERL supports ithreads], 
[am_cv_prog_PERL_ithreads],
     use Config;
     if ($Config{useithreads})
       {
-       require threads;
-       import threads;
-       require Thread::Queue;
-       import Thread::Queue;
-       exit 0;
+        require threads;
+        import threads;
+        require Thread::Queue;
+        import Thread::Queue;
+        exit 0;
       }
     exit 1;' >&AS_MESSAGE_LOG_FD 2>&1
 then
@@ -611,10 +611,10 @@ AC_CONFIG_LINKS([GNUmakefile:GNUmakefile])
 
 AC_CONFIG_FILES([t/wrap/aclocal-${APIVERSION}:t/wrap/aclocal.in],
                 [chmod +x t/wrap/aclocal-${APIVERSION}],
-               [APIVERSION=$APIVERSION])
+                [APIVERSION=$APIVERSION])
 AC_CONFIG_FILES([t/wrap/automake-${APIVERSION}:t/wrap/automake.in],
                 [chmod +x t/wrap/automake-${APIVERSION}],
-               [APIVERSION=$APIVERSION])
+                [APIVERSION=$APIVERSION])
 
 AC_OUTPUT
 
@@ -632,7 +632,8 @@ am_release_type=`AS_ECHO(["$PACKAGE_VERSION"]) | LC_ALL=C 
awk ["
   /^$am_beta_version_rx$/ { print \"beta version\"; exit(0); }
   { print \"development snapshot\"; }"]`
 
-test "$am_release_type" = stable || cat <<EOF
+# '$silent' is set to yes if configure is passed the '--quiet' option.
+test "$am_release_type" = stable || test "$silent" = yes || cat <<EOF
 
 WARNING: You are about to use a $am_release_type of automake.
 WARNING: It might easily suffer from new bugs or regressions.
diff --git a/lib/config.sub b/lib/config.sub
index 826e4c6..89b1286 100755
--- a/lib/config.sub
+++ b/lib/config.sub
@@ -259,8 +259,10 @@ case $basic_machine in
        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | 
alpha64pca5[67] \
        | am33_2.0 \
-       | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | 
avr32 \
-        | be32 | be64 \
+       | arc \
+       | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+       | avr | avr32 \
+       | be32 | be64 \
        | bfin \
        | c4x | clipper \
        | d10v | d30v | dlx | dsp16xx \
diff --git a/lib/texinfo.tex b/lib/texinfo.tex
index f3093d0..b5f3141 100644
--- a/lib/texinfo.tex
+++ b/lib/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2012-09-12.16}
+\def\texinfoversion{2012-11-08.11}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -6559,16 +6559,9 @@ end
 \makedispenvdef{quotation}{\quotationstart}
 %
 \def\quotationstart{%
-  {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
-  \parindent=0pt
-  %
-  % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
+  \indentedblockstart % same as \indentedblock, but increase right margin too.
   \ifx\nonarrowing\relax
-    \advance\leftskip by \lispnarrowing
     \advance\rightskip by \lispnarrowing
-    \exdentamount = \lispnarrowing
-  \else
-    \let\nonarrowing = \relax
   \fi
   \parsearg\quotationlabel
 }
@@ -6594,6 +6587,32 @@ end
   \fi
 }
 
+% @indentedblock is like @quotation, but indents only on the left and
+% has no optional argument.
+% 
+\makedispenvdef{indentedblock}{\indentedblockstart}
+%
+\def\indentedblockstart{%
+  {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
+  \parindent=0pt
+  %
+  % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
+  \ifx\nonarrowing\relax
+    \advance\leftskip by \lispnarrowing
+    \exdentamount = \lispnarrowing
+  \else
+    \let\nonarrowing = \relax
+  \fi
+}
+
+% Keep a nonzero parskip for the environment, since we're doing normal filling.
+%
+\def\Eindentedblock{%
+  \par
+  {\parskip=0pt \afterenvbreak}%
+}
+\def\Esmallindentedblock{\Eindentedblock}
+
 
 % LaTeX-like @address@hidden verbatim and @verb{<char>...<char>}
 % If we want to allow any <char> as delimiter,
diff --git a/syntax-checks.mk b/syntax-checks.mk
index 1632006..a4dcdf2 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -42,9 +42,8 @@ ams := $(shell find $(srcdir) -name '*.dir' -prune -o -name 
'*.am' -print)
 # guaranteed to work on my machine.
 syntax_check_rules = \
 $(sc_tests_plain_check_rules) \
-sc_diff_automake_in_automake \
-sc_diff_aclocal_in_automake \
-sc_perl_syntax \
+sc_diff_automake \
+sc_diff_aclocal \
 sc_no_brace_variable_expansions \
 sc_rm_minus_f \
 sc_no_for_variable_in_macro \
@@ -81,26 +80,25 @@ sc_tabs_in_texi \
 sc_at_in_texi
 
 ## These check avoids accidental configure substitutions in the source.
-## There are exactly 9 lines that should be modified from automake.in to
-## automake, and 10 lines that should be modified from aclocal.in to
-## aclocal; these wors out to 32 and 34 lines of diffs, respectively.
-sc_diff_automake_in_automake:
-       @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 32; then \
-         echo "found too many diffs between automake.in and automake" 1>&2; \
-         diff -c $(srcdir)/automake.in automake; \
-         exit 1; \
-       fi
-sc_diff_aclocal_in_aclocal:
-       @if test `diff $(srcdir)/aclocal.in aclocal | wc -l` -ne 34; then \
-         echo "found too many diffs between aclocal.in and aclocal" 1>&2; \
-         diff -c $(srcdir)/aclocal.in aclocal; \
-         exit 1; \
-       fi
-
-## Syntax check with default Perl (on my machine, Perl 5).
-sc_perl_syntax:
-       @perllibdir="./lib$(PATH_SEPARATOR)$(srcdir)/lib" $(PERL) -c -w automake
-       @perllibdir="./lib$(PATH_SEPARATOR)$(srcdir)/lib" $(PERL) -c -w aclocal
+## There are exactly 8 lines that should be modified from automake.in to
+## automake, and 9 lines that should be modified from aclocal.in to
+## aclocal.
+automake_diff_no = 8
+aclocal_diff_no = 9
+sc_diff_automake sc_diff_aclocal: sc_diff_% :
+       @set +e; tmp=$*-diffs.tmp; \
+        diff -u $(srcdir)/$*.in $* > $$tmp; test $$? -eq 1 || exit 1; \
+        added=`grep -v '^+++ ' $$tmp | grep -c '^+'` || exit 1; \
+        removed=`grep -v '^--- ' $$tmp | grep -c '^-'` || exit 1; \
+        test $$added,$$removed = $($*_diff_no),$($*_diff_no) \
+         || { \
+           echo "Found unexpected diffs between $*.in and $*"; \
+           echo "Lines added:   $$added"  ; \
+           echo "Lines removed: $$removed"; \
+           cat $$tmp >&2; \
+           exit 1; \
+         } >&1; \
+       rm -f $$tmp
 
 ## Expect no instances of '${...}'.  However, $${...} is ok, since that
 ## is a shell construct, not a Makefile construct.
diff --git a/t/wrap/aclocal.in b/t/wrap/aclocal.in
index a3defa9..ea3819a 100644
--- a/t/wrap/aclocal.in
+++ b/t/wrap/aclocal.in
@@ -19,11 +19,9 @@
 BEGIN
 {
   use strict;
-  my $libdir;
-  $libdir = '@abs_top_srcdir@/lib';
-  $libdir = '@abs_top_builddir@/lib' . '@PATH_SEPARATOR@' . $libdir
+  @Aclocal::perl_libdirs = ('@abs_top_srcdir@/lib');
+  unshift @Aclocal::perl_libdirs, '@abs_top_builddir@/lib'
     if '@srcdir@' ne '.';
-  $ENV{perllibdir} = $libdir;
   unshift @ARGV,
     'address@hidden@/m4',
     'address@hidden@/m4/acdir';
diff --git a/t/wrap/automake.in b/t/wrap/automake.in
index 8417360..3302b3f 100644
--- a/t/wrap/automake.in
+++ b/t/wrap/automake.in
@@ -19,11 +19,9 @@
 BEGIN
 {
   use strict;
-  my $libdir;
-  $libdir = '@abs_top_srcdir@/lib';
-  $libdir = '@abs_top_builddir@/lib' . '@PATH_SEPARATOR@' . $libdir
+  @Automake::perl_libdirs = ('@abs_top_srcdir@/lib');
+  unshift @Automake::perl_libdirs, '@abs_top_builddir@/lib'
     if '@srcdir@' ne '.';
-  $ENV{perllibdir} = $libdir;
   unshift @ARGV, 'address@hidden@/lib';
 }
 require '@abs_top_builddir@/automake';


hooks/post-receive
-- 
GNU Automake