From: Kurt Zeilenga <kurt@openldap.org>
Date: Sun, 31 Dec 2000 03:17:18 +0000 (+0000)
Subject: Update CDPATH clearing code
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~1617
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=aeb1b9c50a11040e28c7e931cbc80f1564add5c8;p=openldap

Update CDPATH clearing code
---

diff --git a/configure b/configure
index 68a795f8db..a195d6fbdf 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # $OpenLDAP$
-# from OpenLDAP: pkg/ldap/configure.in,v 1.339 2000/10/16 02:10:27 kurt Exp  
+# from OpenLDAP: pkg/ldap/configure.in,v 1.340 2000/12/31 01:32:49 kurt Exp  
 
 # Copyright 1998-2000 The OpenLDAP Foundation.  All Rights Reserved.
 # 
@@ -644,13 +644,13 @@ fi
 
 
 # set unset (borrowed from autoconf 2.14a)
-if (unset FOO) >/dev/null 2>&1; then
+if (OL_FOO=OL_FOO; unset OL_FOO) >/dev/null 2>&1; then
   ol_unset=unset
 else
   ol_unset=false
 fi
 # unset CDPATH
-$ol_unset CDPATH || test "${CDPATH+set}" != set || CDPATH=: && export CDPATH
+$ol_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; && export CDPATH; }
 
 ac_aux_dir=
 for ac_dir in build $srcdir/build; do
diff --git a/configure.in b/configure.in
index 5c940b7aa4..ace9940526 100644
--- a/configure.in
+++ b/configure.in
@@ -34,13 +34,13 @@ dnl Configure.in for OpenLDAP
 AC_INIT(build/version.sh)dnl
 
 # set unset (borrowed from autoconf 2.14a)
-if (unset FOO) >/dev/null 2>&1; then
+if (OL_FOO=OL_FOO; unset OL_FOO) >/dev/null 2>&1; then
   ol_unset=unset
 else
   ol_unset=false
 fi
 # unset CDPATH
-$ol_unset CDPATH || test "${CDPATH+set}" != set || CDPATH=: && export CDPATH
+$ol_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; && export CDPATH; }
 
 AC_CONFIG_AUX_DIR(build)dnl