FYI: libtool--devo--1.0--patch-92

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Applied to HEAD.
- -- 
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://tkd.kicks-ass.net
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook
_________________________________________________________
This patch notification generated by tlaapply version 0.5
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (Darwin)

iD8DBQFBB78fFRMICSmD1gYRAvB6AKCyQYSxixVNoOMbMCLIiG16WfAquACdEt7p
aYPdzqwpGbaXsGNNC1xvXlc=
=AqJp
-----END PGP SIGNATURE-----

* looking for address@hidden/libtool--devo--1.0--patch-91 to compare with
* comparing to address@hidden/libtool--devo--1.0--patch-91
M  ChangeLog
M  libtoolize.in
M  ltmain.in
M  m4/libtool.m4

* modified files

Index: Changelog
from  Gary V. Vaughan  <address@hidden>

        To take full advantage of this, libtool must be bootstrapped with
        CVS autoconf, otherwise pdksh chokes on some nested escaped quotes
        from libtool.m4.  Using CVS autoconf protects configure from
        non-bourne compatible shells in the same way this changeset
        protects libtool and libtoolize:

        * libtoolize.in: Include latest CVS autoconf AS_SHELL_SANITIZE
        expansion to make various shells fully bourne compatible.
        * ltmain.in: Ditto.
        * m4/libtool.m4 (AC_PATH_TOOL_PREFIX): Remove spurious quotes, the
        RHS of = assignment is not IFS split.
        (_LT_LANG_CXX_CONFIG): Ditto.
        (AC_LIBTOOL_POSTDEP_PREDEP): Ditto.

--- orig/libtoolize.in
+++ mod/libtoolize.in
@@ -47,6 +47,19 @@
 #
 # Report bugs to <address@hidden>.
 
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+elif test -n "${BASH_VERSION+set}${KSH_VERSION+set}" && (set -o posix) 
>/dev/null 2>&1; then
+  set -o posix
+fi
+DUALCASE=1; export DUALCASE # for MKS sh
+
 : ${CP="cp -f"}
 : ${LN_S="@LN_S@"}
 : ${MKDIR="mkdir"}


--- orig/ltmain.in
+++ mod/ltmain.in
@@ -24,11 +24,18 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
+elif test -n "${BASH_VERSION+set}${KSH_VERSION+set}" && (set -o posix) 
>/dev/null 2>&1; then
+  set -o posix
 fi
+DUALCASE=1; export DUALCASE # for MKS sh
 
 basename="s,^.*/,,g"
 
@@ -526,7 +533,7 @@
          darwin_curdir=`pwd`
          darwin_base_archive=`basename $darwin_archive`
          darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $GREP 
Architectures 2>/dev/null`
-         if test -n "$darwin_arches"; then 
+         if test -n "$darwin_arches"; then
            darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
            darwin_arch=
            $show "$darwin_base_archive has multiple architectures 
$darwin_arches"


--- orig/m4/libtool.m4
+++ mod/m4/libtool.m4
@@ -2169,7 +2169,7 @@
       if test -n "$file_magic_test_file"; then
        case $deplibs_check_method in
        "file_magic "*)
-         file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic 
\(.*\)\"`"
+         file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
          MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
          if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
            $EGREP "$file_magic_regex" > /dev/null; then
@@ -5284,7 +5284,7 @@
            # Commands to make compiler produce verbose output that lists
            # what "hidden" libraries, object files and flags are used when
            # linking a shared library.
-           output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 
2>&1 | $GREP \"\-L\""
+           output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 
2>&1 | $GREP "\-L"'
          else
            # g++ 2.7 appears to require `-G' NOT `-shared' on this
            # platform.
@@ -5295,7 +5295,7 @@
            # Commands to make compiler produce verbose output that lists
            # what "hidden" libraries, object files and flags are used when
            # linking a shared library.
-           output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | 
$GREP \"\-L\""
+           output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | 
$GREP "\-L"'
          fi
 
          _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -5427,7 +5427,7 @@
   # The `*' in the case matches for architectures that use `case' in
   # $output_verbose_cmd can trigger glob expansion during the loop
   # eval without this substitution.
-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e 
\"$no_glob_subst\"`"
+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e 
"$no_glob_subst"`
 
   for p in `eval $output_verbose_link_cmd`; do
     case $p in