Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change all occurances of 

test -d "$directory"

to

	test ! -z "directory" -a -d "directory"

Apparently, on SunOS 4.1.4_JL (and other?) OSes, -d on an empty string
always returns true.  This closes SF bug #115392.
This commit is contained in:
Barry Warsaw 2000-10-05 18:45:53 +00:00
parent 3dc0a514e6
commit 7d1219d9bd
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -3102,10 +3102,10 @@ if test "$with_threads" = "no"
then then
USE_THREAD_MODULE="#" USE_THREAD_MODULE="#"
else else
if test -d "$with_threads" if test ! -z $with_threads -a -d $with_threads
then LDFLAGS="$LDFLAGS -L$with_threads" then LDFLAGS="$LDFLAGS -L$with_threads"
fi fi
if test -d "$withval" if test ! -z $withval -a -d $withval
then LDFLAGS="$LDFLAGS -L$withval" then LDFLAGS="$LDFLAGS -L$withval"
fi fi
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
@ -3782,7 +3782,7 @@ EOF
DYNLOADFILE="dynload_dl.o" DYNLOADFILE="dynload_dl.o"
dldir=$withval dldir=$withval
if test -d "$dldir" if test ! -z $dldir -a -d $dldir
then LDFLAGS="$LDFLAGS -L$dldir" then LDFLAGS="$LDFLAGS -L$dldir"
else { echo "configure: error: proper usage is --with-sgi-dl=DIRECTORY" 1>&2; exit 1; } else { echo "configure: error: proper usage is --with-sgi-dl=DIRECTORY" 1>&2; exit 1; }
fi fi
@ -3807,7 +3807,7 @@ EOF
DYNLOADFILE="dynload_dl.o" DYNLOADFILE="dynload_dl.o"
dldir=`echo "$withval" | sed 's/,.*//'` dldir=`echo "$withval" | sed 's/,.*//'`
dlddir=`echo "$withval" | sed 's/.*,//'` dlddir=`echo "$withval" | sed 's/.*,//'`
if test -d "$dldir" -a -d "$dlddir" if test ! -z "$dldir" -a -d "$dldir" -a ! -z "$dlddir" -a -d "$dlddir"
then LDFLAGS="$LDFLAGS -L$dldir -L$dlddir" then LDFLAGS="$LDFLAGS -L$dldir -L$dlddir"
else { echo "configure: error: proper usage is --with-dl-dld=DL_DIRECTORY" 1>&2; exit 1; } else { echo "configure: error: proper usage is --with-dl-dld=DL_DIRECTORY" 1>&2; exit 1; }
fi fi

8
configure.in
View File

@ -750,10 +750,10 @@ if test "$with_threads" = "no"
then then
USE_THREAD_MODULE="#" USE_THREAD_MODULE="#"
else else
if test -d "$with_threads" if test ! -z $with_threads -a -d $with_threads
then LDFLAGS="$LDFLAGS -L$with_threads" then LDFLAGS="$LDFLAGS -L$with_threads"
fi fi
if test -d "$withval" if test ! -z $withval -a -d $withval
then LDFLAGS="$LDFLAGS -L$withval" then LDFLAGS="$LDFLAGS -L$withval"
fi fi
AC_DEFINE(_REENTRANT) AC_DEFINE(_REENTRANT)
@ -889,7 +889,7 @@ AC_MSG_RESULT($withval)
AC_DEFINE(WITH_SGI_DL) AC_DEFINE(WITH_SGI_DL)
DYNLOADFILE="dynload_dl.o" DYNLOADFILE="dynload_dl.o"
dldir=$withval dldir=$withval
if test -d "$dldir" if test ! -z $dldir -a -d $dldir
then LDFLAGS="$LDFLAGS -L$dldir" then LDFLAGS="$LDFLAGS -L$dldir"
else AC_ERROR(proper usage is --with-sgi-dl=DIRECTORY) else AC_ERROR(proper usage is --with-sgi-dl=DIRECTORY)
fi fi
@ -903,7 +903,7 @@ AC_DEFINE(WITH_DL_DLD)
DYNLOADFILE="dynload_dl.o" DYNLOADFILE="dynload_dl.o"
dldir=`echo "$withval" | sed 's/,.*//'` dldir=`echo "$withval" | sed 's/,.*//'`
dlddir=`echo "$withval" | sed 's/.*,//'` dlddir=`echo "$withval" | sed 's/.*,//'`
if test -d "$dldir" -a -d "$dlddir" if test ! -z "$dldir" -a -d "$dldir" -a ! -z "$dlddir" -a -d "$dlddir"
then LDFLAGS="$LDFLAGS -L$dldir -L$dlddir" then LDFLAGS="$LDFLAGS -L$dldir -L$dlddir"
else AC_ERROR(proper usage is --with-dl-dld=DL_DIRECTORY,DLD_DIRECTORY) else AC_ERROR(proper usage is --with-dl-dld=DL_DIRECTORY,DLD_DIRECTORY)
fi fi