From 7925c417c59119843151194c251a4a767cb102a9 Mon Sep 17 00:00:00 2001
From: Nathan Bryant <loanshark@uncensored.citadel.org>
Date: Tue, 26 Mar 2002 05:58:35 +0000
Subject: [PATCH] don't check for a database driver until after the openssl
 check is complete. if the ld paths aren't set up for the db installation this
 can interfere with the openssl check because it tries to run a program linked
 against the libraries we've been finding.

---
 citadel/ChangeLog    |  7 ++++
 citadel/configure.ac | 84 ++++++++++++++++++++++----------------------
 2 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 0032b978e..5042e2e1f 100644
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,10 @@
  $Log$
+ Revision 590.166  2002/03/26 05:58:35  nbryant
+ don't check for a database driver until after the openssl check is
+ complete. if the ld paths aren't set up for the db installation this
+ can interfere with the openssl check because it tries to run a program
+ linked against the libraries we've been finding.
+
  Revision 590.165  2002/03/26 05:20:46  nbryant
  removed last vestiges of "#ifdef CIT_CLIENT" conditional compilation,
  which has been rendered unusable by the build system simplifications
@@ -3556,3 +3562,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 a13c6342e..2463dc046 100644
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -145,7 +145,7 @@ if test "$ac_cv_func_dlopen" = no; then
                test "$with_pam" = yes && chkpwd_LIBS="-ldl $chkpwd_LIBS"])
 fi
 
-dnl Check for HP/UX dyanmic loader. This should only be in -ldld.
+dnl Check for HP/UX dynamic loader. This should only be in -ldld.
 AC_CHECK_LIB(dld, shl_load, LIBS="-ldld $LIBS")
 
 dnl Check for Solaris realtime support
@@ -187,46 +187,6 @@ if test "$enable_autologin" != no; then
 	fi
 fi
 
-if test "x$with_db" != xno -a "x$with_gdbm" != xyes; then
-	test "$db_dir" && LDFLAGS="$LDFLAGS -L$db_dir/lib"
-
-	dblib=""
-
-	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
-		with_gdbm=no
-	])
-
-fi
-
-if test "x$with_gdbm" != xno -a "x$with_db" != xyes; then
-	test -f /usr/local/lib/libgdbm.a -o -f /usr/local/lib/libgdbm.so && db_dir=/usr/local
-	test "$db_dir" && LDFLAGS="$LDFLAGS -L$db_dir/lib"
-
-	test "$db_dir" && CPPFLAGS="$CPPFLAGS -I$db_dir/include"
-
-        AC_CHECK_LIB(gdbm, gdbm_open,
-                [LIBS="-lgdbm $LIBS"
-                DATABASE=database.c
-                with_db=no])
-fi
-
 test -f /usr/local/lib/libresolv.a && LDFLAGS="$LDFLAGS -L/usr/local/lib"
 AC_CHECK_LIB(resolv, res_query, RESOLV="$RESOLV -lresolv")
 
@@ -350,7 +310,47 @@ if test "$with_ssl" != "no"; then
 		fi
 	fi
 fi
-	
+
+if test "x$with_db" != xno -a "x$with_gdbm" != xyes; then
+	test "$db_dir" && LDFLAGS="$LDFLAGS -L$db_dir/lib"
+
+	dblib=""
+
+	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
+		with_gdbm=no
+	])
+
+fi
+
+if test "x$with_gdbm" != xno -a "x$with_db" != xyes; then
+	test -f /usr/local/lib/libgdbm.a -o -f /usr/local/lib/libgdbm.so && db_dir=/usr/local
+	test "$db_dir" && LDFLAGS="$LDFLAGS -L$db_dir/lib"
+
+	test "$db_dir" && CPPFLAGS="$CPPFLAGS -I$db_dir/include"
+
+        AC_CHECK_LIB(gdbm, gdbm_open,
+                [LIBS="-lgdbm $LIBS"
+                DATABASE=database.c
+                with_db=no])
+fi
+
 dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
-- 
2.39.2