From 88422f3bf0c0631e619b2cdac7375957d0766d59 Mon Sep 17 00:00:00 2001 From: Nathan Bryant Date: Tue, 26 Mar 2002 05:13:32 +0000 Subject: [PATCH] fix monstrous shell script syntax in configure.ac --- citadel/ChangeLog | 4 ++++ citadel/configure.ac | 21 ++++++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/citadel/ChangeLog b/citadel/ChangeLog index 329b2c9f8..ef0a10e40 100644 --- 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 Fri Jul 10 1998 Art Cancro * Initial CVS import + diff --git a/citadel/configure.ac b/citadel/configure.ac index 59a37a1a3..a13c6342e 100644 --- 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 -- 2.39.2