fix monstrous shell script syntax in configure.ac

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 329b2c9f87877826d4348341089c19c884a029e1..ef0a10e405514e456e13c762b4aa5ee7fdde6728 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 590.164  2002/03/26 05:13:32  nbryant
+ fix monstrous shell script syntax in configure.ac
+
  Revision 590.163  2002/03/26 04:38:31  nbryant
   * support autoconf 2.53
   * make a note that people should be using libtool 1.4d
@@ -3549,3 +3552,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import 
+

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 59a37a1a3445a1cc44ec0e8209666706e77288c4..a13c6342eaa649460ee076e2fa7390c3ac4ecb59 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -191,11 +191,22 @@ if test "x$with_db" != xno -a "x$with_gdbm" != xyes; then
        test "$db_dir" && LDFLAGS="$LDFLAGS -L$db_dir/lib"
 
        dblib=""
-       test -d "$db_dir/include/db4" && CPPFLAGS="$CPPFLAGS -I$db_dir/include/db4" && dblib="db4" || \
-       ( test -d "$db_dir/include/db3" && CPPFLAGS="$CPPFLAGS -I$db_dir/include/db3" && dblib="db3" ) || \
-       ( test "$db_dir" -a -d "$db_dir/include" && CPPFLAGS="$CPPFLAGS -I$db_dir/include" ) || \
-       ( test -d /usr/include/db4 && CPPFLAGS="$CPPFLAGS -I/usr/include/db4" && dblib="db4" ) || \
-       ( test -d /usr/include/db3 && CPPFLAGS="$CPPFLAGS -I/usr/include/db3" && dblib="db3" )
+
+       if test -d "$db_dir/include/db4"; then
+               CPPFLAGS="$CPPFLAGS -I$db_dir/include/db4"
+               dblib="db4"
+       elif test -d "$db_dir/include/db3"; then
+               CPPFLAGS="$CPPFLAGS -I$db_dir/include/db3"
+               dblib="db3"
+       elif test "$db_dir"; then
+               CPPFLAGS="$CPPFLAGS -I$db_dir/include"
+       elif test -d /usr/include/db4; then
+               CPPFLAGS="$CPPFLAGS -I/usr/include/db4"
+               dblib="db4"
+       elif test -d /usr/include/db3; then
+               CPPFLAGS="$CPPFLAGS -I/usr/include/db3"
+               dblib="db3"
+       fi
 
        AC_SEARCH_LIBS(db_env_create, [$dblib db db4 db3], [
                DATABASE=database_sleepycat.c