[SCM] GNU Libtool branch, master, updated. v2.2.6-22-gcdeb1af

[Paolo Bonzini]

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 Libtool".

The branch, master has been updated
       via  cdeb1af5111ab6a034e134a6a5f8689e463984be (commit)
       via  bf5eab9d04b339fe1123724f62d2e96579f1f087 (commit)
       via  3796d1fe58e5cab065021f215aec47e44ab91f78 (commit)
       via  621e2d7cb34b88dee9f5c46f2e58254d3c447d0e (commit)
       via  e5ba92ad9c707d003caed0eaa9f697a10a01daba (commit)
      from  101ad44541c6d303cf465937a212042885f4338e (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 cdeb1af5111ab6a034e134a6a5f8689e463984be
Author: Paolo Bonzini <address@hidden>
Date:   Fri Nov 7 14:47:19 2008 +0100

    Separate part of _LT_SETUP into other macros, detect ECHO sooner.
    
    * libltdl/m4/libtool.m4 (_LT_PREPARE_SED_QUOTE_VARS): New macro,
    extracted from...
    (_LT_SETUP): ... here.  Require _LT_PROG_ECHO_BACKSLASH sooner.

commit bf5eab9d04b339fe1123724f62d2e96579f1f087
Author: Paolo Bonzini <address@hidden>
Date:   Mon Nov 10 08:27:45 2008 +0100

    Fix quoting when config.status generates libtool config.
    
    * libltdl/m4libtool.m4 (_LT_OUTPUT_LIBTOOL_COMMANDS_INIT):
    Double quote ECHO-ed variables.

commit 3796d1fe58e5cab065021f215aec47e44ab91f78
Author: Paolo Bonzini <address@hidden>
Date:   Mon Nov 10 08:25:24 2008 +0100

    Use documented M4sh interfaces.
    
    * clcommit.m4sh: Do not unset CDPATH, use AS_INIT and M4sh diversions.
    * libltdl/config/mailnotify.m4sh: Likewise.
    * libtoolize.m4sh: Likewise.
    * tests/defs.m4sh: Likewise.
    * tests/testsuite.at: Move AT_INIT invocation at the top.
    
    * libltdl/m4/libtool.m4 (_LT_GENERATED_FILE_INIT): New.
    (LT_OUTPUT): Use it.
    
    * libltdl/config/general.m4sh (M4SH_IN_HEADER): New.
    (progpath): Move setting before $0 could be clobbered.
    * libltdl/config/ltmain.m4sh (M4SH_IN_HEADER): New.

commit 621e2d7cb34b88dee9f5c46f2e58254d3c447d0e
Author: Paolo Bonzini <address@hidden>
Date:   Mon Nov 10 08:22:02 2008 +0100

    Run sh.test on the M4sh source.
    
    * tests/defs.m4sh (scripts): Point to pre-m4 sources.

commit e5ba92ad9c707d003caed0eaa9f697a10a01daba
Author: Paolo Bonzini <address@hidden>
Date:   Fri Nov 7 08:58:24 2008 +0100

    Avoid that autom4te complains about unexpanded macros.
    
    * libtoolize.m4sh: Allow occurrences of "dnl" and use quadrigraphs
    to protect other m4 macros.

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

Summary of changes:
 ChangeLog                      |   40 +++++++++++++++++
 clcommit.m4sh                  |    7 +--
 libltdl/config/general.m4sh    |   20 ++++++---
 libltdl/config/ltmain.m4sh     |    4 ++
 libltdl/config/mailnotify.m4sh |    7 +--
 libltdl/m4/libtool.m4          |   91 ++++++++++++++++++++++++++--------------
 libtoolize.m4sh                |   17 ++++----
 tests/defs.m4sh                |   10 ++---
 tests/testsuite.at             |    5 +-
 9 files changed, 135 insertions(+), 66 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1abce44..1d22ee7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,43 @@
+2008-11-10  Paolo Bonzini  <address@hidden>
+
+       Separate part of _LT_SETUP into other macros, detect ECHO sooner.
+       * libltdl/m4/libtool.m4 (_LT_PREPARE_SED_QUOTE_VARS): New macro,
+       extracted from...
+       (_LT_SETUP): ... here.  Require _LT_PROG_ECHO_BACKSLASH sooner.
+
+2008-11-10  Paolo Bonzini  <address@hidden>
+
+       Fix quoting when config.status generates libtool config.
+       * libltdl/m4libtool.m4 (_LT_OUTPUT_LIBTOOL_COMMANDS_INIT):
+       Double quote ECHO-ed variables.
+
+2008-11-10  Paolo Bonzini  <address@hidden>
+
+       Use documented M4sh interfaces.
+       * clcommit.m4sh: Do not unset CDPATH, use AS_INIT and M4sh diversions.
+       * libltdl/config/mailnotify.m4sh: Likewise.
+       * libtoolize.m4sh: Likewise.
+       * tests/defs.m4sh: Likewise.
+       * tests/testsuite.at: Move AT_INIT invocation at the top.
+
+       * libltdl/m4/libtool.m4 (_LT_INIT_GENERATED): New.
+       (LT_OUTPUT): Use it.
+
+       * libltdl/config/general.m4sh (M4SH_IN_HEADER): New.
+       (progpath): Move setting before $0 could be clobbered.
+       * libltdl/config/ltmain.m4sh (M4SH_IN_HEADER): New.
+
+2008-11-10  Paolo Bonzini  <address@hidden>
+
+       Run sh.test on the M4sh source.
+       * tests/defs.m4sh (scripts): Point to pre-m4 sources.
+
+2008-11-10  Paolo Bonzini  <address@hidden>
+
+       Avoid that autom4te complains about unexpanded macros.
+       * libtoolize.m4sh: Allow occurrences of "dnl" and use quadrigraphs
+       to protect other m4 macros.
+
 2008-11-11  Bruno Haible  <address@hidden>
            Ralf Wildenhues  <address@hidden>
 
diff --git a/clcommit.m4sh b/clcommit.m4sh
index 0d3ba42..73719cc 100644
--- a/clcommit.m4sh
+++ b/clcommit.m4sh
@@ -1,5 +1,4 @@
-m4_define([_m4_divert(SCRIPT)], 100)
-m4_divert_push([SCRIPT])#!/bin/sh
+AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
 # @configure_input@
 
 # clcommit (GNU @PACKAGE@) version 2.0
@@ -80,9 +79,7 @@ test -f "libltdl/config/$MKSTAMP" && 
MKSTAMP="libltdl/config/$MKSTAMP"
 
 PROGRAM=clcommit
 
-AS_SHELL_SANITIZE
-$as_unset CDPATH
-
+m4_divert_pop
 m4_include([getopt.m4sh])
 
 M4SH_VERBATIM([[
diff --git a/libltdl/config/general.m4sh b/libltdl/config/general.m4sh
index 53ff5ea..cde7354 100644
--- a/libltdl/config/general.m4sh
+++ b/libltdl/config/general.m4sh
@@ -30,6 +30,19 @@ or obtained by writing to the Free Software Foundation, Inc.,
 
 m4_define([M4SH_VERBATIM], [$1])dnl
 
+m4_ifndef([M4SH_IN_HEADER],
+[m4_define([M4SH_IN_HEADER],
+[m4_divert_text([HEADER-COPYRIGHT], [$1])])])
+
+M4SH_IN_HEADER([dnl
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+])
+
 M4SH_VERBATIM([[
 : ${CP="cp -f"}
 : ${ECHO="echo"}
@@ -87,13 +100,6 @@ func_dirname_and_basename ()
 
 # Generated shell functions inserted here.
 
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
 # The name of this program:
 # In the unlikely event $progname began with a '-', it would play havoc with
 # func_echo (imagine progname=-n), so we prepend ./ in that case:
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index e7a5ff0..363ab93 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -111,6 +111,10 @@ done
 
 $lt_unset CDPATH
 
+dnl This script is generated by config.status, so we cannot put things
+dnl in the header.
+m4_define([M4SH_IN_HEADER], [$1])dnl
+
 m4_include([getopt.m4sh])
 
 M4SH_VERBATIM([[
diff --git a/libltdl/config/mailnotify.m4sh b/libltdl/config/mailnotify.m4sh
index 20d6b83..a95f201 100644
--- a/libltdl/config/mailnotify.m4sh
+++ b/libltdl/config/mailnotify.m4sh
@@ -1,5 +1,4 @@
-m4_define([_m4_divert(SCRIPT)], 100)
-m4_divert_push([SCRIPT])#!/bin/sh
+AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
 # @configure_input@
 
 # mailnotify (GNU @PACKAGE@) version 0.6
@@ -63,9 +62,7 @@ m4_divert_push([SCRIPT])#!/bin/sh
 
 PROGRAM=mailnotify
 
-AS_SHELL_SANITIZE
-$as_unset CDPATH
-
+m4_divert_pop
 m4_include([getopt.m4sh])
 
 M4SH_VERBATIM([[
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index caf88b1..0b2f320 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -138,6 +138,9 @@ m4_defun([_LT_FILEUTILS_DEFAULTS],
 m4_defun([_LT_SETUP],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -179,7 +182,6 @@ fi
 _LT_CHECK_OBJDIR
 
 m4_require([_LT_TAG_COMPILER])dnl
-_LT_PROG_ECHO_BACKSLASH
 
 case $host_os in
 aix3*)
@@ -193,23 +195,6 @@ aix3*)
   ;;
 esac
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
 # Global variables:
 ofile=libtool
 can_build_shared=yes
@@ -250,6 +235,28 @@ _LT_CONFIG_COMMANDS
 ])# _LT_SETUP
 
 
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
 # _LT_PROG_LTMAIN
 # ---------------
 # Note that this code is called both from `configure', and `config.status'
@@ -520,7 +527,7 @@ compiler='$compiler_DEFAULT'
 # Quote evaled strings.
 for var in lt_decl_all_varnames([[ \
 ]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""X\\\\\$\$var"\\\\"\` in
     *[[\\\\\\\`\\"\\\$]]*)
       eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e 
\\"\\\$sed_quote_subst\\"\\\`\\\\\\""
       ;;
@@ -533,7 +540,7 @@ done
 # Double-quote double-evaled strings.
 for var in lt_decl_all_varnames([[ \
 ]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""X\\\\\$\$var"\\\\"\` in
     *[[\\\\\\\`\\"\\\$]]*)
       eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e 
\\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e 
\\"\\\$delay_variable_subst\\"\\\`\\\\\\""
       ;;
@@ -553,6 +560,35 @@ esac
 _LT_OUTPUT_LIBTOOL_INIT
 ])
 
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# `#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test $lt_write_fail = 0 && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
 
 # LT_OUTPUT
 # ---------
@@ -562,20 +598,11 @@ _LT_OUTPUT_LIBTOOL_INIT
 AC_DEFUN([LT_OUTPUT],
 [: ${CONFIG_LT=./config.lt}
 AC_MSG_NOTICE([creating $CONFIG_LT])
-cat >"$CONFIG_LT" <<_LTEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate a libtool stub with the current configuration.
-
-lt_cl_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_LTEOF
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
 
 cat >>"$CONFIG_LT" <<\_LTEOF
-AS_SHELL_SANITIZE
-_AS_PREPARE
-
-exec AS_MESSAGE_FD>&1
+lt_cl_silent=false
 exec AS_MESSAGE_LOG_FD>>config.log
 {
   echo
diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index f74cd7c..30c3e3b 100644
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -1,5 +1,5 @@
-m4_define([_m4_divert(SCRIPT)], 100)
-m4_divert_push([SCRIPT])#! /bin/sh
+m4_pattern_allow([dnl])
+AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
 # @configure_input@
 
 # libtoolize (GNU @PACKAGE@@TIMESTAMP@) @VERSION@
@@ -70,9 +70,7 @@ m4_divert_push([SCRIPT])#! /bin/sh
 
 PROGRAM=libtoolize
 
-AS_SHELL_SANITIZE
-$as_unset CDPATH
-
+m4_divert_pop
 m4_include([getopt.m4sh])
 
 M4SH_VERBATIM([[
@@ -478,8 +476,9 @@ func_scan_files ()
     # ---------------------------------------------------- #
 
     my_sed_traces='s,#.*$,,; s,^dnl .*$,,; s, dnl .*$,,
-        s,^.*AC_REQUIRE(.*$,,; s,^.*m4_require(.*$,,; s,^.*m4_define(.*$,,
-       s,^.*A[CU]_DEFUN(.*$,,; s,^.*m4_defun(.*$,,
+        s,^.*AC_REQUIRE(.*$,,; s,^.*m4@&address@hidden(.*$,,;
+       s,^.*m4@&address@hidden(.*$,,
+       s,^.*A[CU]_DEFUN(.*$,,; s,^.*m4@&address@hidden(.*$,,
        /AC_CONFIG_AUX_DIR(/ {
            s,^.*AC_CONFIG_AUX_DIR([[   ]*\([^])]*\).*$,ac_auxdir=\1,
            p
@@ -670,8 +669,8 @@ func_included_files ()
 
     my_include_regex=
     my_sed_include='
-        /^m4_include(\[.*\])$/ {
-           s,^m4_include(\[\(.*\)\])$,\1,
+        /^m4@&address@hidden(\[.*\])$/ {
+           s,^m4@&address@hidden(\[\(.*\)\])$,\1,
            p
        }
         d'
diff --git a/tests/defs.m4sh b/tests/defs.m4sh
index d63558c..48d1d37 100644
--- a/tests/defs.m4sh
+++ b/tests/defs.m4sh
@@ -1,5 +1,5 @@
-m4_define([_m4_divert(SCRIPT)], 100)
-m4_divert_push([SCRIPT])# @configure_input@
+AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
+# @configure_input@
 # defs -- Defines for Libtool testing environment.
 #
 #   Copyright (C) 2003, 2004, 2005, 2007, 2008 Free Software
@@ -26,9 +26,7 @@ m4_divert_push([SCRIPT])# @configure_input@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ####
 
-AS_SHELL_SANITIZE
-$as_unset CDPATH
-
+m4_divert_pop
 m4_include([general.m4sh])
 
 M4SH_VERBATIM([[
@@ -349,7 +347,7 @@ prefix="./_inst"
 srcdir=`cd $srcdir && pwd`
 m4dir=$srcdir/libltdl/m4
 auxdir=$srcdir/libltdl/config
-scripts="$auxdir/ltmain.sh ./libtoolize"
+scripts="$auxdir/ltmain.m4sh $srcdir/libtoolize.m4sh"
 
 func_msg "Running $progname"
 
diff --git a/tests/testsuite.at b/tests/testsuite.at
index d5b0fe8..5990291 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -23,6 +23,8 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ####
 
+AT_INIT
+
 m4_divert_push([PREPARE_TESTS])dnl
 : ${tst_dist=dist}
 : ${ACLOCAL=aclocal}
@@ -371,5 +373,4 @@ dnl AT_TESTED([grep autoreconf autom4te automake])
 ## The suite.  ##
 ## ----------- ##
 
-AT_INIT
-# The other tests will be appended here by the Makefile rule.
+# Tests will be appended here by the Makefile rule.


hooks/post-receive
--
GNU Libtool