Protect shell variables in berkeley db tests.

diff --git a/CHANGES b/CHANGES
index eba7c365de0832695e59ace73dc28a5e380e9cc5..8e337dcc198f393a8edc63842f89f43b313a3564 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ Changes included in OpenLDAP 1.2
        Update ldap_open(3) man page to note ldap_init() is preferred.
        Build environment
                Fixed mkdep to handle multiple dependent files on one line
+               Fixed openldap.m4 to "protect" shell variable
 
 Changes included in OpenLDAP 1.2
        CVS Tag: OPENLDAP_REL_ENG_1_2_BETA

diff --git a/build/openldap.m4 b/build/openldap.m4
index 30b2873bd413f8d30ccf2bbe902f50b6b728892f..85e77c7266e4c45675a90e0957aaaf47b19679b2 100644 (file)
--- a/build/openldap.m4
+++ b/build/openldap.m4
@@ -109,7 +109,7 @@ AC_DEFUN([OL_BERKELEY_DB2],
 [AC_REQUIRE([OL_LIB_BERKELEY_DB2])
  AC_REQUIRE([OL_HEADER_BERKELEY_DB2])
  AC_CACHE_CHECK([for Berkeley DB2], [ol_cv_berkeley_db2], [
-       if test $ol_cv_lib_db2 = no -o $ol_cv_header_db2 = no ; then
+       if test "$ol_cv_lib_db2" = no -o "$ol_cv_header_db2" = no ; then
                ol_cv_berkeley_db2=no
        else
                ol_cv_berkeley_db2=yes
@@ -132,7 +132,7 @@ dnl
 AC_DEFUN([OL_HEADER_BERKELEY_DB],
 [AC_REQUIRE([OL_HEADER_BERKELEY_DB2])
 AC_CHECK_HEADERS(db_185.h)
-if test $ol_cv_header_db2 = yes ; then
+if test "$ol_cv_header_db2" = yes ; then
        dnl db.h is db2! 
 
        ol_cv_header_db=$ac_cv_header_db_185_h
@@ -175,7 +175,7 @@ AC_DEFUN([OL_BERKELEY_DB],
 [AC_REQUIRE([OL_LIB_BERKELEY_DB])
  AC_REQUIRE([OL_HEADER_BERKELEY_DB])
  AC_CACHE_CHECK([for Berkeley DB], [ol_cv_berkeley_db], [
-       if test $ol_cv_lib_db = no -o $ol_cv_header_db = no ; then
+       if test "$ol_cv_lib_db" = no -o "$ol_cv_header_db" = no ; then
                ol_cv_berkeley_db=no
        else
                ol_cv_berkeley_db=yes