From 693a4c3764d90b73dd7edef3e568fb3d3303a868 Mon Sep 17 00:00:00 2001 From: Nathan Bryant Date: Tue, 11 Dec 2001 16:54:39 +0000 Subject: [PATCH] better detection of --- citadel/configure.ac | 8 +++----- citadel/database_sleepycat.c | 6 ++++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/citadel/configure.ac b/citadel/configure.ac index 776c40d1e..c12c04339 100644 --- a/citadel/configure.ac +++ b/citadel/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. dnl $Id$ AC_PREREQ(2.52) -AC_INIT([Citadel/UX], [5.80], [http://uncensored.citadel.org/]) +AC_INIT([Citadel/UX], [5.91], [http://uncensored.citadel.org/]) AC_REVISION([$Revision$]) AC_CONFIG_SRCDIR([citserver.c]) AC_PREFIX_DEFAULT(/usr/local/citadel) @@ -220,10 +220,8 @@ dnl Checks for header files. AC_HEADER_DIRENT AC_HEADER_STDC AC_HEADER_SYS_WAIT -test "$db_dir" && CPPFLAGS="$CPPFLAGS -I$db_dir/include" || \ - ( test -d /usr/include/db3 && CPPFLAGS="$CPPFLAGS -I/usr/include/db3" ) || \ - ( test -d /usr/local/include/db3 && CPPFLAGS="$CPPFLAGS -I/usr/local/include/db3" ) -AC_CHECK_HEADERS(curses.h dl.h fcntl.h limits.h termios.h sys/ioctl.h sys/select.h sys/time.h syslog.h unistd.h utmp.h utmpx.h paths.h) +test "$db_dir" && CPPFLAGS="$CPPFLAGS -I$db_dir/include" +AC_CHECK_HEADERS(curses.h dl.h fcntl.h limits.h termios.h sys/ioctl.h sys/select.h sys/time.h syslog.h unistd.h utmp.h utmpx.h paths.h db3/db.h) AC_CHECK_HEADER(resolv.h, [SMTP=modules/libsmtp.la; DOMAIN=domain.c]) AC_SUBST(SMTP) diff --git a/citadel/database_sleepycat.c b/citadel/database_sleepycat.c index 2c51ebc9d..203192305 100644 --- a/citadel/database_sleepycat.c +++ b/citadel/database_sleepycat.c @@ -32,7 +32,13 @@ #include #include #include + +#ifdef HAVE_DB3_DB_H +#include +#else #include +#endif + #include #include "citadel.h" #include "server.h" -- 2.39.2