Fixup to detect qdbm includes in /usr/include/qdbm.

Remove HAVE_QDBM_VILLA_H because it is redundant.

diff --git a/configure.ac b/configure.ac
index 604815479233b2bcf138b8727650ff59590536bb..ab47802e3856d30bf978b3380926fdb5aa78616d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -837,12 +837,20 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching])
     then
       if test -n "$with_qdbm" -a "$with_qdbm" != "yes"
       then
-        CPPFLAGS="$CPPFLAGS -I$with_qdbm/include"
+        if test -d $with_qdbm/include/qdbm; then
+          CPPFLAGS="$CPPFLAGS -I$with_qdbm/include/qdbm"
+       else
+          CPPFLAGS="$CPPFLAGS -I$with_qdbm/include"
+       fi
         LDFLAGS="$LDFLAGS -L$with_qdbm/lib"
+      else
+         if test -d /usr/include/qdbm; then
+           CPPFLAGS="$CPPFLAGS -I/usr/include/qdbm"
+        fi
       fi
 
       saved_LIBS="$LIBS"
-      AC_CHECK_HEADERS(villa.h qdbm/villa.h)
+      AC_CHECK_HEADERS(villa.h)
       AC_CHECK_LIB(qdbm, vlopen, [MUTTLIBS="$MUTTLIBS -lqdbm"; use_qdbm=yes])
       LIBS="$saved_LIBS"
       if test -n "$with_qdbm" -a "$use_qdbm" != yes

diff --git a/hcache.c b/hcache.c
index 0ee890ad59f221cc6d0e7b3a231b0e91413a713b..efb4eee9c2c42ee9989ca54292e52cd19eaf599b 100644 (file)
--- a/hcache.c
+++ b/hcache.c
@@ -26,11 +26,6 @@
 #include <depot.h>
 #include <cabin.h>
 #include <villa.h>
-#elif HAVE_QDBM_VILLA_H
-#include <qdbm/depot.h>
-#include <qdbm/cabin.h>
-#include <qdbm/villa.h>
-#endif
 #elif HAVE_GDBM
 #include <gdbm.h>
 #elif HAVE_DB4