[Python-checkins] CVS: python/dist/src configure,1.157,1.158 configure.in,1.166,1.167

[Barry Warsaw]

Update of /cvsroot/python/python/dist/src
In directory slayer.i.sourceforge.net:/tmp/cvs-serv14007

Modified Files:
	configure configure.in 
Log Message:
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.



Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.157
retrieving revision 1.158
diff -C2 -r1.157 -r1.158
*** configure	2000/10/05 18:00:05	1.157
--- configure	2000/10/05 18:45:52	1.158
***************
*** 3103,3110 ****
      USE_THREAD_MODULE="#"
  else
!     if test -d "$with_threads"
      then LDFLAGS="$LDFLAGS -L$with_threads"
      fi
!     if test -d "$withval"
      then LDFLAGS="$LDFLAGS -L$withval"
      fi
--- 3103,3110 ----
      USE_THREAD_MODULE="#"
  else
!     if test ! -z $with_threads -a -d $with_threads
      then LDFLAGS="$LDFLAGS -L$with_threads"
      fi
!     if test ! -z $withval -a -d $withval
      then LDFLAGS="$LDFLAGS -L$withval"
      fi
***************
*** 3783,3787 ****
  DYNLOADFILE="dynload_dl.o"
  dldir=$withval
! if test -d "$dldir"
  then LDFLAGS="$LDFLAGS -L$dldir"
  else { echo "configure: error: proper usage is --with-sgi-dl=DIRECTORY" 1>&2; exit 1; }
--- 3783,3787 ----
  DYNLOADFILE="dynload_dl.o"
  dldir=$withval
! 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; }
***************
*** 3808,3812 ****
  dldir=`echo "$withval" | sed 's/,.*//'`
  dlddir=`echo "$withval" | sed 's/.*,//'`
! if test -d "$dldir" -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; }
--- 3808,3812 ----
  dldir=`echo "$withval" | sed 's/,.*//'`
  dlddir=`echo "$withval" | sed 's/.*,//'`
! 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; }

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.166
retrieving revision 1.167
diff -C2 -r1.166 -r1.167
*** configure.in	2000/10/05 18:00:06	1.166
--- configure.in	2000/10/05 18:45:53	1.167
***************
*** 751,758 ****
      USE_THREAD_MODULE="#"
  else
!     if test -d "$with_threads"
      then LDFLAGS="$LDFLAGS -L$with_threads"
      fi
!     if test -d "$withval"
      then LDFLAGS="$LDFLAGS -L$withval"
      fi
--- 751,758 ----
      USE_THREAD_MODULE="#"
  else
!     if test ! -z $with_threads -a -d $with_threads
      then LDFLAGS="$LDFLAGS -L$with_threads"
      fi
!     if test ! -z $withval -a -d $withval
      then LDFLAGS="$LDFLAGS -L$withval"
      fi
***************
*** 890,894 ****
  DYNLOADFILE="dynload_dl.o"
  dldir=$withval
! if test -d "$dldir"
  then LDFLAGS="$LDFLAGS -L$dldir"
  else AC_ERROR(proper usage is --with-sgi-dl=DIRECTORY)
--- 890,894 ----
  DYNLOADFILE="dynload_dl.o"
  dldir=$withval
! if test ! -z $dldir -a -d $dldir
  then LDFLAGS="$LDFLAGS -L$dldir"
  else AC_ERROR(proper usage is --with-sgi-dl=DIRECTORY)
***************
*** 904,908 ****
  dldir=`echo "$withval" | sed 's/,.*//'`
  dlddir=`echo "$withval" | sed 's/.*,//'`
! if test -d "$dldir" -a -d "$dlddir"
  then LDFLAGS="$LDFLAGS -L$dldir -L$dlddir"
  else AC_ERROR(proper usage is --with-dl-dld=DL_DIRECTORY,DLD_DIRECTORY)
--- 904,908 ----
  dldir=`echo "$withval" | sed 's/,.*//'`
  dlddir=`echo "$withval" | sed 's/.*,//'`
! 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)