finally changed configure to complain if there's no database driver ;)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 5958d7d5ad1e7811ad5be218ad553f439e8eef26..568a67f770c398aa8b14906dea4ef04e6e3211f6 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 590.8  2001/12/14 21:33:18  nbryant
+ finally changed configure to complain if there's no database driver ;)
+
  Revision 590.7  2001/12/14 08:29:30  error
  * Security: trace file is now only readable by owner, since it contains
    plain text passwords.
@@ -2964,3 +2967,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 5abfa6b0f2155764d7421a5cf8e345b2cdafb2aa..0b8cb2465839272d73be4b8e53311c286e80e668 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -281,7 +281,6 @@ LIBS="$PTHREAD_LIBS $LIBS"
 
 dnl On some platforms, AC_CHECK_FUNC[S] doesn't work for pthreads programs;
 dnl we need to include pthread.h
-dnl AC_CHECK_FUNCS(pthread_cancel)
 
 AC_CACHE_CHECK([for pthread_cancel], ac_cv_func_pthread_cancel,
 [AC_TRY_LINK([#include <pthread.h>],
@@ -300,8 +299,6 @@ if test "$ac_cv_func_pthread_cancel" = yes; then
        AC_DEFINE(HAVE_PTHREAD_CANCEL)
 fi
 
-dnl AC_CHECK_FUNC(pthread_create, TARGETS="client server utils serv_modules")
-
 AC_CACHE_CHECK([for pthread_create], ac_cv_func_pthread_create,
 [AC_TRY_LINK([#include <pthread.h>],
 [      /* The GNU C library defines this for functions which it implements
@@ -314,7 +311,7 @@ AC_CACHE_CHECK([for pthread_create], ac_cv_func_pthread_create,
 #endif],
 ac_cv_func_pthread_create=yes, ac_cv_func_pthread_create=no)])
 if test "$ac_cv_func_pthread_create" = yes; then
-       TARGETS="client server utils serv_modules"
+       test "$DATABASE" && TARGETS="client server utils serv_modules"
        if test "x$enable_threaded_client" != xno; then
                AC_DEFINE(THREADED_CLIENT)
                CLIENT_PTLIBS=$PTHREAD_LIBS
@@ -351,3 +348,7 @@ AC_SUBST(DATABASE)
 AC_CONFIG_HEADER(sysdep.h)
 AC_CONFIG_FILES([Makefile weekly])
 AC_OUTPUT
+
+if test -z "$DATABASE"; then
+       AC_MSG_WARN([No database driver was found. Please install Berkeley DB.])
+fi