From c790a508d2a7e0ec133e9688664123fb52df2df8 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 28 Jan 1999 19:28:07 +0000
Subject: [PATCH] Protect shell variables in berkeley db tests.

---
 CHANGES           | 1 +
 build/openldap.m4 | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index eba7c365de..8e337dcc19 100644
--- 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 30b2873bd4..85e77c7266 100644
--- 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