From 755d391dc20da8640a97efeb1acaf9202ed3fbbf Mon Sep 17 00:00:00 2001
From: Peter O'Gorman <peter@pogma.com>
Date: Fri, 30 Jul 2004 13:35:30 +0000
Subject: [PATCH] * m4/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.

---
 ChangeLog     |  6 ++++++
 ltmain.in     |  4 +---
 m4/libtool.m4 | 12 +++---------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4a94ed52b..0b5714f4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-30  Peter O'Gorman  <peter@pogma.com>
+
+	* m4/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.
+
 2004-07-29  Gary V. Vaughan  <gary@gnu.org>
 
 	* Makefile.am ($(top_srcdir)/config/ltmain.sh): Ugh. More hair to
diff --git a/ltmain.in b/ltmain.in
index 6afe1175d..91fe69370 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -5176,9 +5176,7 @@ EOF
 Xsed='${SED} -e 1s/^X//'
 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=\${ZSH_VERSION+.}:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 relink_command=\"$relink_command\"
 
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 6a6c7b848..475e09f5a 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -433,9 +433,7 @@ m4_define([_LT_AC_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
 m4_define([_LT_CONFIG_COMMANDS],
 [AC_CONFIG_COMMANDS([libtool], [_LT_OUTPUT_LIBTOOL_COMMANDS], [
 
-# 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=${ZSH_VERSION+.}:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 sed_quote_subst='$sed_quote_subst'
 double_quote_subst='$double_quote_subst'
@@ -503,9 +501,7 @@ _LT_LIBTOOL_CONFIG_VARS
 _LT_LIBTOOL_TAG_VARS
 # ### END LIBTOOL CONFIG
 
-# 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
 
 _LT_EOF
 
@@ -716,9 +712,7 @@ _LT_EOF
   exit 0
 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
-- 
2.47.2