From d22b3c16bffb69f54c8f623f9a54e1a6c82ca12d Mon Sep 17 00:00:00 2001
From: Michael Elkins <me@mutt.org>
Date: Thu, 5 Apr 2007 21:38:19 -0700
Subject: [PATCH] Fixup to detect qdbm includes in /usr/include/qdbm.

Remove HAVE_QDBM_VILLA_H because it is redundant.
---
 configure.ac | 12 ++++++++++--
 hcache.c     |  5 -----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 604815479..ab47802e3 100644
--- 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 0ee890ad5..efb4eee9c 100644
--- 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
-- 
2.50.1