[FYI] CDPATH and module var patches

[Peter O'Gorman]

Gary V. Vaughan wrote:
> How's the ZSH patch coming along btw?

I just committed these two little patches.

Peter
--
Peter O'Gorman - http://www.pogma.com

Index: ChangeLog
        * ltmain.in [darwin]: We already had a module var, there can be
        only one.

Index: ltmain.in
===================================================================
RCS file: /cvsroot/libtool/libtool/ltmain.in,v
retrieving revision 1.407
diff -u -3 -p -u -r1.407 ltmain.in
--- ltmain.in 30 Jul 2004 13:35:30 -0000 1.407
+++ ltmain.in 30 Jul 2004 13:40:11 -0000
@@ -2739,9 +2739,9 @@ EOF
          # Warn about portability, can't link against -module's on some
          # systems (darwin).  Don't bleat about dlopened modules though!
          dlopenmodule=""
-         for module in $dlprefiles; do
-           if test "X$module" = "X$lib"; then
-             dlopenmodule="$module"
+         for dlpremoduletest in $dlprefiles; do
+           if test "X$dlpremoduletest" = "X$lib"; then
+             dlopenmodule="$dlpremoduletest"
              break
            fi
          done

Index: ChangeLog
2004-07-30  Peter O'Gorman  <address@hidden>

        * 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.

from  Gary V. Vaughan  <address@hidden>
Index: ltmain.in
===================================================================
RCS file: /cvsroot/libtool/libtool/ltmain.in,v
retrieving revision 1.406
diff -u -3 -p -u -r1.406 ltmain.in
--- ltmain.in 28 Jul 2004 16:14:01 -0000 1.406
+++ ltmain.in 30 Jul 2004 13:31:47 -0000
@@ -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\"
 
Index: m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/libtool.m4,v
retrieving revision 1.82
diff -u -3 -p -u -r1.82 libtool.m4
--- m4/libtool.m4 29 Jul 2004 09:34:00 -0000 1.82
+++ m4/libtool.m4 30 Jul 2004 13:31:53 -0000
@@ -433,9 +433,7 @@ m4_define([_LT_AC_TAGVAR], [m4_ifval([$2
 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