[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-624-g006c818

[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=006c81818a2711be33d562590859448a23f02122

The branch, branch-1.11 has been updated
       via  006c81818a2711be33d562590859448a23f02122 (commit)
       via  a4eeb5323ac00cd6dbbb571a738bf2ee9f8ef209 (commit)
       via  4bae0177efccaf64ce4d04ecae3a8389c81a83e2 (commit)
      from  d8e4a588c7a855133817239fec78ce725a6e28e6 (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 006c81818a2711be33d562590859448a23f02122
Merge: d8e4a58 a4eeb53
Author: Stefano Lattarini <address@hidden>
Date:   Tue Nov 22 10:33:31 2011 +0100

    Merge branch 'maint' into branch-1.11
    
    * maint:
      texinfo: work around Solaris 10 xpg4 shell bug in install rules
      configure: report perl version in config.log

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

Summary of changes:
 ChangeLog          |   15 +++++++++++++++
 configure          |    6 ++++++
 configure.ac       |    2 ++
 lib/am/texinfos.am |   14 ++++++++++----
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b438d12..839ecf4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2011-11-19  Stefano Lattarini  <address@hidden>
+
+       texinfo: work around Solaris 10 xpg4 shell bug in install rules
+       * lib/am/texinfos.am (install-html-am): Use an extra variable
+       indirection to work around a bug in Solaris 10 /usr/xpg4/bin/sh.
+       Bug revealed by a failure of `txinfo21.test'.  See also:
+       <http://lists.gnu.org/archive/html/bug-autoconf/2011-11/msg00005.html>
+       <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10026#23>
+
+2011-11-17  Stefano Lattarini  <address@hidden>
+
+       configure: report perl version in config.log
+       * configure.ac: Report the version of the selected perl interpreter
+       in config.log; this should render the logs more informative.
+
 2011-11-13  Stefano Lattarini  <address@hidden>
 
        tests: fix spurious failure with older install-info
diff --git a/configure b/configure
index d6ae9d8..507d7be 100755
--- a/configure
+++ b/configure
@@ -2331,6 +2331,12 @@ fi
 if test -z "$PERL"; then
    as_fn_error $? "perl not found" "$LINENO" 5
 fi
+# Save details about the selected perl interpreter in config.log.
+{ echo "$as_me:$LINENO: eval $PERL --version" >&5
+   (eval $PERL --version) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
 $PERL -e 'require 5.006;' || {
    as_fn_error $? "perl 5.6 or better is required; perl 5.8.2 or better
 is recommended.  If you have several perl versions
diff --git a/configure.ac b/configure.ac
index 3b02705..25009dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,8 @@ AC_PATH_PROG(PERL, perl)
 if test -z "$PERL"; then
    AC_MSG_ERROR([perl not found])
 fi
+# Save details about the selected perl interpreter in config.log.
+AM_RUN_LOG([eval $PERL --version])
 $PERL -e 'require 5.006;' || {
    AC_MSG_ERROR(
 [perl 5.6 or better is required; perl 5.8.2 or better
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 80712cf..5314dec 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -161,13 +161,19 @@ install-html-am: $(HTMLS)
        for p in $$list; do \
          if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
          $(am__strip_dir) \
-         if test -d "$$d$$p"; then \
+## This indirection is required to work around a bug of the Solaris 10
+## shell /usr/xpg4/bin/sh.  The description of the bug can be found at
+## <http://lists.gnu.org/archive/html/bug-autoconf/2011-11/msg00005.html>
+## and the report of the original failure can be found at automake
+## bug#10026 <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10026#23>
+         d2=$$d$$p; \
+         if test -d "$$d2"; then \
            echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
            $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
-           echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
-           $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
+           echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \
+           $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
          else \
-           list2="$$list2 $$d$$p"; \
+           list2="$$list2 $$d2"; \
          fi; \
        done; \
        test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \


hooks/post-receive
-- 
GNU Automake