Add MacOS support

diff --git a/CHANGES b/CHANGES
index 2dced4d3caab3808672b8f2164a0fc05aefac4fc..73cf6e9aefe259ba01cf4f5c06a17eac1904286c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,7 @@ OpenLDAP 2.0.8 Release Engineering
        Updated ldaptcl
        Build Environment
                Updated top.mk
+               Added MacOS support
        Documentation
                Updated ldapdelete(1)
                Updated ldapsearch(1)

diff --git a/configure.in b/configure.in
index bf55bf3451f44d6444a587fa1ce3d8629c51aaa5..4edc0da4b4f6a0f41582b79e8acd63267082ca1e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -33,14 +33,14 @@ dnl ================================================================
 dnl Configure.in for OpenLDAP
 AC_INIT(build/version)dnl
 
-# set unset (borrowed from autoconf 2.14a)
-if (unset FOO) >/dev/null 2>&1; then
+# set unset (borrowed from autoconf 2.49c)
+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
 
@@ -56,8 +56,8 @@ dnl           we try not to use this for much
 AC_CANONICAL_SYSTEM
 
 AM_INIT_AUTOMAKE(OpenLDAP,[$OL_VERSION], [no defines])dnl
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
+AC_SUBST(PACKAGE)dnl
+AC_SUBST(VERSION)dnl
 AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,"$PACKAGE",Package)
 AC_DEFINE_UNQUOTED(OPENLDAP_VERSION,"$VERSION",Version)