From: Gary V. Vaughan <gary@gnu.org>
Date: Wed, 1 Sep 2004 09:48:25 +0000 (+0000)
Subject: * libtoolize.in, config/ltmain.in: Add CDPATH protection to
X-Git-Tag: release-1-9d~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d9235e58cca9cfe40ff5e798f3b467f404d281a;p=thirdparty%2Flibtool.git

* libtoolize.in, config/ltmain.in: Add CDPATH protection to
preamble.
* tests/defs: Put a full m4sh.m4 style 'Be Bourne compatible'
preamble in here too.
* HACKING: Note that tests/defs needs synching with m4sh.m4 too.
* TODO: Add new item.
---

diff --git a/ChangeLog b/ChangeLog
index 717cc2364..1ca4e1c42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2004-09-01  Gary V. Vaughan  <gary@gnu.org>
 
+	* libtoolize.in, config/ltmain.in: Add CDPATH protection to
+	preamble.
+	* tests/defs: Put a full m4sh.m4 style 'Be Bourne compatible'
+	preamble in here too.
+	* HACKING: Note that tests/defs needs synching with m4sh.m4 too.
+	* TODO: Add new item.
+
 	* libltdl/ltdl.c (try_dlopen, lt_dlforeachfile): Use correct cpp
 	macro name, LT_DLSEARCH_PATH.
 
diff --git a/HACKING b/HACKING
index 957de3193..0df96e1e2 100644
--- a/HACKING
+++ b/HACKING
@@ -131,9 +131,9 @@ and is not part of a release distribution.
 * Update NEWS, ChangeLog.
 
 * Make sure the 'Be Bourne compatible' shell snippet near the top of
-  ./libtoolize.in, ./ltmain.in matches the latest autoconf wisdom by
-  updating to match CVS autoconf AS_SHELL_SANITIZE in autoconf's
-  lib/m4sugar/m4sh.m4.
+  ./libtoolize.in, config/ltmain.in and tests/defs matches the latest
+  autoconf wisdom by updating to match CVS autoconf AS_SHELL_SANITIZE in
+  autoconf's lib/m4sugar/m4sh.m4.
 
 * Run ./bootstrap.
 
diff --git a/TODO b/TODO
index 9647a0032..639307879 100644
--- a/TODO
+++ b/TODO
@@ -7,6 +7,10 @@ GNU Libtool
 1.1. libtool
 ------------
 
+* Factor common shell preamble and function definitions into a separate
+  file and substitute the contents into all of our shell scripts at
+  bootstrap, to avoid any synchronisation issues.
+
 * We could have an option to hardcode paths into libraries, as well as
   binaries: `... -Wl,-soname -Wl,/tmp/libtest.so.0 ...'.  This is not
   possible on all platforms, and is in part obviated by the ability of
diff --git a/config/ltmain.in b/config/ltmain.in
index 29395ac4f..009109599 100644
--- a/config/ltmain.in
+++ b/config/ltmain.in
@@ -80,6 +80,10 @@ elif test -n "${BASH_VERSION+set}${KSH_VERSION+set}" && (set -o posix) >/dev/nul
 fi
 DUALCASE=1; export DUALCASE # for MKS sh
 
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
 dirname="s,/[^/]*$,,"
 basename="s,^.*/,,g"
 
diff --git a/libtoolize.in b/libtoolize.in
index ed5d1e2ee..5bc34abd3 100644
--- a/libtoolize.in
+++ b/libtoolize.in
@@ -70,6 +70,10 @@ elif test -n "${BASH_VERSION+set}${KSH_VERSION+set}" && (set -o posix) >/dev/nul
 fi
 DUALCASE=1; export DUALCASE # for MKS sh
 
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
 : ${CP="cp -f"}
 : ${LN_S="@LN_S@"}
 : ${MKDIR="mkdir"}
diff --git a/tests/defs b/tests/defs
index f99074f0d..3b3492ba2 100644
--- a/tests/defs
+++ b/tests/defs
@@ -3,11 +3,22 @@
 # Gord Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 # Gary V. Vaughan <gary@gnu.org>, 2003
 
-# 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
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # Check that srcdir is set to an absolute path.
 case "$srcdir" in