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.
diff --git a/configure b/configure
index 9a75606..ac81fbb 100755
--- a/configure
+++ b/configure
@@ -3102,10 +3102,10 @@
then
USE_THREAD_MODULE="#"
else
- if test -d "$with_threads"
+ if test ! -z $with_threads -a -d $with_threads
then LDFLAGS="$LDFLAGS -L$with_threads"
fi
- if test -d "$withval"
+ if test ! -z $withval -a -d $withval
then LDFLAGS="$LDFLAGS -L$withval"
fi
cat >> confdefs.h <<\EOF
@@ -3782,7 +3782,7 @@
DYNLOADFILE="dynload_dl.o"
dldir=$withval
-if test -d "$dldir"
+if test ! -z $dldir -a -d $dldir
then LDFLAGS="$LDFLAGS -L$dldir"
else { echo "configure: error: proper usage is --with-sgi-dl=DIRECTORY" 1>&2; exit 1; }
fi
@@ -3807,7 +3807,7 @@
DYNLOADFILE="dynload_dl.o"
dldir=`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"
else { echo "configure: error: proper usage is --with-dl-dld=DL_DIRECTORY" 1>&2; exit 1; }
fi
diff --git a/configure.in b/configure.in
index e2adc75..eefea04 100644
--- a/configure.in
+++ b/configure.in
@@ -750,10 +750,10 @@
then
USE_THREAD_MODULE="#"
else
- if test -d "$with_threads"
+ if test ! -z $with_threads -a -d $with_threads
then LDFLAGS="$LDFLAGS -L$with_threads"
fi
- if test -d "$withval"
+ if test ! -z $withval -a -d $withval
then LDFLAGS="$LDFLAGS -L$withval"
fi
AC_DEFINE(_REENTRANT)
@@ -889,7 +889,7 @@
AC_DEFINE(WITH_SGI_DL)
DYNLOADFILE="dynload_dl.o"
dldir=$withval
-if test -d "$dldir"
+if test ! -z $dldir -a -d $dldir
then LDFLAGS="$LDFLAGS -L$dldir"
else AC_ERROR(proper usage is --with-sgi-dl=DIRECTORY)
fi
@@ -903,7 +903,7 @@
DYNLOADFILE="dynload_dl.o"
dldir=`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"
else AC_ERROR(proper usage is --with-dl-dld=DL_DIRECTORY,DLD_DIRECTORY)
fi