* libtool.m4, ltmain.in: autoconf now says the best thing to do

with CDPATH is to (unset CDPATH) >/dev/null 2>&1 && unset CDPATH,
so do it.

diff --git a/ChangeLog b/ChangeLog
index 9d300b428669b7705b484db029524bb8f23b0f4b..970a864c6deaae93ae97c6ffe20b440b43598dfc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-07-30  Peter O'Gorman  <peter@pogma.com>
 
+       * libtool.m4, ltmain.in:  autoconf now says the best thing to do
+       with CDPATH is to (unset CDPATH) >/dev/null 2>&1 && unset CDPATH,
+       so do it.
+
        * libtool.m4 [darwin]: $GREP is not defined here, use $EGREP.
        * ltmain.in (func_extract_archives): Backport func_extract_archives
        from cvs HEAD to reduce code size and enable the darwin fat archive

diff --git a/libtool.m4 b/libtool.m4
index 1905fddbfc087a308fd8cdddc57c4f1e367eaa41..ed19d6b76332dff3b6e2514507fc62a0758f75ce 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -319,7 +319,7 @@ fi
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
@@ -3980,7 +3980,7 @@ Xsed="$SED -e s/^X//"
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # The names of the tagged configurations supported by this script.
 available_tags=

diff --git a/ltmain.in b/ltmain.in
index 9d8e0c484cf826c9736bfe34311e644f3bca20fc..a1cd198895a0cc3ad8eb76c7f93b2c10f91afc17 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -4831,7 +4831,7 @@ sed_quote_subst='$sed_quote_subst'
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 relink_command=\"$relink_command\"