From: Peter O'Gorman <peter@pogma.com>
Date: Fri, 30 Jul 2004 14:02:12 +0000 (+0000)
Subject: * libtool.m4, ltmain.in:  autoconf now says the best thing to do
X-Git-Tag: release-1-5-8~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a8923de3b17a8213960ea34ff818cc3ae660584;p=thirdparty%2Flibtool.git

* 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 9d300b428..970a864c6 100644
--- 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 1905fddbf..ed19d6b76 100644
--- 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 9d8e0c484..a1cd19889 100644
--- 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\"