libtool-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

more zsh crapology


From: Peter O'Gorman
Subject: more zsh crapology
Date: Thu, 04 Dec 2003 00:21:09 +0900
User-agent: Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.5b) Gecko/20030902 Thunderbird/0.2

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

A threesome of zsh stuff.
~ 4-
zsh ls -l gives strange results when the time on the file is in the future:
bash-2.05a$ ls -l foo
- -rw-r--r--    1 ogorman  users           0 Dec  3  2003 foo
bash-2.05a$ ls -l foo
- -rw-r--r--    1 ogorman  users           0 Dec  3 07:14 foo

This makes the mdemo-dryrun.test fail on the Mac OS X 10.1 box on
sourceforge's compile farm (the nfs servers time is slightly ahead of
the OS X boxes time). aliased ls to /bin/ls in the test.

5-
Straight from
http://www.gnu.org/manual/autoconf-2.53/html_node/Special-Shell-Variables.html

6-
Makes config.status check for
if test -n "${ZSH_VERSION+set}"
rather than "" or "set"

Okay to apply?

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

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (Darwin)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iQCVAwUBP83/Y7iDAg3OZTLPAQKNxAP/dR4GqLtvTacrPgPUTRUydutmYmOEmpMF
ZAYkCYpYrsuqL3gJOy+UfVI5REIP9Tef8t83x2C+0bT3Dk6I+grdvqO+h4pipMWA
ZdIPOJ7jGVUAeB+iu1i5J6aEIsnYUp4IWsxQf7qQYn1UrRBuAsm+jQ3rKusA68fj
hAU/7f3odgk=
=TLO6
-----END PGP SIGNATURE-----
Index: ChangeLog
2003-12-03  Peter O'Gorman  <address@hidden>

        * tests/mdemo-dryrun.test: If using zsh alias ls=/bin/ls. Fixes a
        problem if the nfs file server time is ahead of the local machines
        time.

Index: tests/mdemo-dryrun.test
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/mdemo-dryrun.test,v
retrieving revision 1.1
diff -u -r1.1 mdemo-dryrun.test
--- tests/mdemo-dryrun.test 14 Oct 2003 21:46:13 -0000 1.1
+++ tests/mdemo-dryrun.test 2 Dec 2003 14:35:19 -0000
@@ -27,6 +27,10 @@
 fi
 . $srcdir/defs || exit 1
 
+if test -n "{ZSH_VERSION+set}" && test -x /bin/ls ; then
+    alias ls=/bin/ls
+fi
+
 func_require "mdemo-conf" "mdemo/Makefile"
 
 func_mkprefixdir
Index: ChangeLog
2003-12-03  Peter O'Gorman  <address@hidden>

        * m4/libtool.m4: Ensure that ${ZSH_VERSION+set} is properly escaped.

Index: m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/libtool.m4,v
retrieving revision 1.23
diff -u -r1.23 libtool.m4
--- m4/libtool.m4 28 Nov 2003 13:41:22 -0000 1.23
+++ m4/libtool.m4 2 Dec 2003 14:57:01 -0000
@@ -104,7 +104,7 @@
 _LT_CONFIG_LIBTOOL_INIT([
 # See if we are running on zsh, and set the options which allow our
 # commands through without removal of \ escapes INIT.                          
   
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "\${ZSH_VERSION+set}" ; then
    setopt NO_GLOB_SUBST
 fi
 ])
Index: ChangeLog
2003-12-03  Peter O'Gorman  <address@hidden>

        * m4/libtool.m4 (CDPATH): Change the CDPATH setting so that it
        allows for zsh differences, as noted in the autoconf manual's
        Protable Shell - Special Shell Variables section.

Index: ltmain.in
===================================================================
RCS file: /cvsroot/libtool/libtool/ltmain.in,v
retrieving revision 1.360
diff -u -r1.360 ltmain.in
--- ltmain.in 26 Nov 2003 12:34:22 -0000 1.360
+++ ltmain.in 2 Dec 2003 14:40:01 -0000
@@ -4979,7 +4979,7 @@
 
 # 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
+if test \"\${CDPATH+set}\" = set; then CDPATH=\${ZSH_VERSION+.}:; export 
CDPATH; fi
 
 relink_command=\"$relink_command\"
 
Index: m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/libtool.m4,v
retrieving revision 1.23
diff -u -r1.23 libtool.m4
--- m4/libtool.m4 28 Nov 2003 13:41:22 -0000 1.23
+++ m4/libtool.m4 2 Dec 2003 14:40:18 -0000
@@ -377,7 +377,7 @@
 
 # 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
+if test "X${CDPATH+set}" = Xset; then CDPATH=${ZSH_VERSION+.}:; export CDPATH; 
fi
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
@@ -3909,7 +3909,7 @@
 
 # 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
+if test "X\${CDPATH+set}" = Xset; then CDPATH=\${ZSH_VERSION+.}:; export 
CDPATH; fi
 
 # The names of the tagged configurations supported by this script.
 available_tags=

reply via email to

[Prev in Thread] Current Thread [Next in Thread]