From: Michael Elkins <me@sigpipe.org>
Date: Fri, 6 Apr 2007 04:38:19 +0000 (-0700)
Subject: Fixup to detect qdbm includes in /usr/include/qdbm.
X-Git-Tag: mutt-1-5-15-rel~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f5372058942d63b0432255dbdeaf0c808f3f431f;p=mutt

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 60481547..ab47802e 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 0ee890ad..efb4eee9 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