dreid 01/12/28 12:18:30
Modified: build apu-conf.m4
Log:
Adjust the tests in apu-conf.m4 to use " around the test parameters
so that we can build if the shell requires them. This gets me building
on FreeBSD 4.5 again.
Obtained from: Justin <[EMAIL PROTECTED]>
Reviewed by: David <[EMAIL PROTECTED]>, Aaron <[EMAIL PROTECTED]>
Revision Changes Path
1.22 +16 -16 apr-util/build/apu-conf.m4
Index: apu-conf.m4
===================================================================
RCS file: /home/cvs/apr-util/build/apu-conf.m4,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- apu-conf.m4 2001/12/09 20:19:43 1.21
+++ apu-conf.m4 2001/12/28 20:18:30 1.22
@@ -98,7 +98,7 @@
apu_db_lib=db2
apu_db_version=2
])])
-if test $apu_db_version != 2; then
+if test "$apu_db_version" != "2"; then
AC_CHECK_HEADER(db.h, [
AC_CHECK_LIB(db, db_open, [
apu_db_header=db.h
@@ -120,7 +120,7 @@
apu_db_lib=db3
apu_db_version=3
])])
-if test $apu_db_version != 3; then
+if test "$apu_db_version" != "3"; then
AC_CHECK_HEADER(db.h, [
AC_CHECK_LIB(db, db_create, [
apu_db_header=db.h
@@ -146,7 +146,7 @@
apu_db_lib=db4
apu_db_version=4
])])
-if test $apu_db_version != 4; then
+if test "$apu_db_version" != "4"; then
AC_CHECK_HEADER(db.h, [
AC_CHECK_LIB(db, db_create, [
AC_CHECK_LIB(db, lock_get, [], [
@@ -188,13 +188,13 @@
dnl We're going to try to find the highest version of Berkeley DB supported.
APU_CHECK_DB4
-if test $apu_db_version != 4; then
+if test "$apu_db_version" != "4"; then
APU_CHECK_DB3
- if test $apu_db_version != 3; then
+ if test "$apu_db_version" != "3"; then
APU_CHECK_DB2
- if test $apu_db_version != 2; then
+ if test "$apu_db_version" != "2"; then
APU_CHECK_DB1
- if test $apu_db_version != 1; then
+ if test "$apu_db_version" != "1"; then
APU_CHECK_DB185
fi
fi
@@ -205,7 +205,7 @@
dnl so that the AC_MSG_CHECKING would be output before the actual
dnl checks, but it isn't happening now.
AC_MSG_CHECKING(for Berkeley DB)
-if test $apu_db_version != 0; then
+if test "$apu_db_version" != "0"; then
apu_have_db=1
AC_MSG_RESULT(found db$apu_db_version)
else
@@ -226,7 +226,7 @@
apu_default_dbm=gdbm
;;
db)
- if test $apu_db_version != 0; then
+ if test "$apu_db_version" != "0"; then
apu_use_db=1
apu_default_dbm=db
else
@@ -235,7 +235,7 @@
;;
db1)
APU_CHECK_DB1
- if test $apu_db_version = 1; then
+ if test "$apu_db_version" = "1"; then
apu_use_db=1
apu_default_dbm=db1
else
@@ -244,7 +244,7 @@
;;
db185)
APU_CHECK_DB185
- if test $apu_db_version = 185; then
+ if test "$apu_db_version" = "185"; then
apu_use_db=1
apu_default_dbm=db185
else
@@ -253,7 +253,7 @@
;;
db2)
APU_CHECK_DB2
- if test $apu_db_version = 2; then
+ if test "$apu_db_version" = "2"; then
apu_use_db=1
apu_default_dbm=db2
else
@@ -262,7 +262,7 @@
;;
db3)
APU_CHECK_DB3
- if test $apu_db_version = 3; then
+ if test "$apu_db_version" = "3"; then
apu_use_db=1
apu_default_dbm=db3
else
@@ -271,7 +271,7 @@
;;
db4)
APU_CHECK_DB4
- if test $apu_db_version = 4; then
+ if test "$apu_db_version" = "4"; then
apu_use_db=1
apu_default_dbm=db4
else
@@ -307,12 +307,12 @@
dnl Since we have already done the AC_CHECK_LIB tests, if we have it,
dnl we know the library is there.
-if test $apu_have_gdbm = 1; then
+if test "$apu_have_gdbm" = "1"; then
APR_ADDTO(APRUTIL_EXPORT_LIBS,[-lgdbm])
APR_ADDTO(LIBS,[-lgdbm])
fi
-if test $apu_db_version != 0; then
+if test "$apu_db_version" != "0"; then
APR_ADDTO(APRUTIL_EXPORT_LIBS,[-l$apu_db_lib])
APR_ADDTO(LIBS,[-l$apu_db_lib])
fi
