build: add separate hcache dir

diff --git a/.gitignore b/.gitignore
index 9bb348f527376f591c918b04b2a9033f0597d7fa..c5538cb69b4ce867b95e5d10923bd2c9b020524a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -45,8 +45,7 @@ conftest.c
 conftest.err
 conststrings.c
 depcomp
-hcachever.sh
-hcversion.h
+hcache/hcversion.h
 install-sh
 keymap_alldefs.h
 keymap_defs.h

diff --git a/Makefile.am b/Makefile.am
index 4e23fbfbf365d2ca01cfd5f867fe62cf743987d0..a71ed71941f99dc574a61071e3fb7134dea685c9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --enable-compressed --enable-debug \
        --with-gnutls --with-gss --with-kyotocabinet --with-lmdb --with-qdbm \
        --with-sasl --with-tokyocabinet
 
-SUBDIRS = m4 contrib
+SUBDIRS = m4 contrib hcache
 
 if BUILD_DOC
 SUBDIRS += doc
@@ -28,16 +28,12 @@ endif
 
 bin_SCRIPTS = $(SMIMEAUX_TARGET)
 
-if BUILD_HCACHE
-HCVERSION = hcversion.h
-endif
-
 DOTLOCK_GROUP='mail'
 DOTLOCK_PERMISSION='2755'
 
 distdir = neo$(PACKAGE)-$(VERSION)
 
-BUILT_SOURCES = keymap_defs.h keymap_alldefs.h patchlist.c git_ver.h conststrings.c hcachever.sh $(HCVERSION)
+BUILT_SOURCES = keymap_defs.h keymap_alldefs.h patchlist.c git_ver.h conststrings.c
 
 bin_PROGRAMS = mutt $(DOTLOCK_TARGET) $(PGPAUX_TARGET)
 mutt_SOURCES = addrbook.c alias.c ascii.c attach.c base64.c browser.c buffer.c \
@@ -54,7 +50,7 @@ mutt_SOURCES = addrbook.c alias.c ascii.c attach.c base64.c browser.c buffer.c \
 nodist_mutt_SOURCES = $(BUILT_SOURCES)
 
 mutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAP) $(MUTTLIBS) \
-       $(INTLLIBS) $(LIBICONV) $(GPGME_LIBS)
+       $(INTLLIBS) $(LIBICONV) $(GPGME_LIBS) $(HCACHE_LIBS)
 
 mutt_DEPENDENCIES = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAPDEPS) \
        $(INTLDEPS)
@@ -67,7 +63,7 @@ AM_CPPFLAGS=-I. -I$(top_srcdir) $(GPGME_CFLAGS)
 EXTRA_mutt_SOURCES = account.c bcache.c bcache.h browser.h compress.c \
        crypt_gpgme.c crypt_mod_pgp_classic.c crypt_mod_pgp_gpgme.c \
        crypt_mod_smime_classic.c crypt_mod_smime_gpgme.c dotlock.c \
-       gnupgparse.c hcache.c hcache.h mbyte.h md5.c mutt_idna.c mutt_idna.h \
+       gnupgparse.c mbyte.h md5.c mutt_idna.c mutt_idna.h \
        mutt_lua.c mutt_sasl.c mutt_notmuch.c mutt_socket.c mutt_ssl.c mutt_ssl_gnutls.c \
        mutt_tunnel.c newsrc.c nntp.c pgp.c pgpinvoke.c pgpkey.c pgplib.c \
        pgpmicalg.c pgppacket.c pop.c pop_auth.c pop_lib.c remailer.c \
@@ -77,8 +73,7 @@ EXTRA_DIST = account.h ascii.h attach.h browser.h buffer.h buffy.h ChangeLog \
        ChangeLog.neomutt ChangeLog.nntp charset.h compress.h config.rpath \
        copy.h COPYRIGHT crypt_gpgme.h crypthash.h depcomp dotlock.h extlib.c \
        filter.h functions.h gen_defs globals.h group.h hash.h \
-       hcache_backend.h hcache_bdb.c hcache_gdbm.c hcache_kc.c hcache_lmdb.c \
-       hcache_qdbm.c hcache_tc.c hcachever.sh.in history.h init.h keymap.h \
+       history.h init.h keymap.h \
        lib.h LICENSE.md mailbox.h mapping.h mbyte.h md5.h mime.h mime.types \
        mutt.h mutt_commands.h mutt_crypt.h mutt_curses.h mutt_idna.h \
        mutt_lua.h mutt_menu.h mutt_notmuch.h mutt_options.h mutt_regex.h mutt_sasl.h \
@@ -155,10 +150,6 @@ git_ver.h:
        cmp -s git_ver.h.tmp git_ver.h || mv git_ver.h.tmp git_ver.h; \
        rm -f git_ver.h.tmp
 
-hcversion.h: $(srcdir)/mutt.h $(srcdir)/rfc822.h hcachever.sh $(MUTT_MD5)
-       ( echo '#include "config.h"'; echo '#include "mutt.h"'; ) \
-       | $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) - | sh ./hcachever.sh hcversion.h
-
 patchlist.c: $(srcdir)/PATCHES $(srcdir)/patchlist.sh
        $(srcdir)/patchlist.sh < $(srcdir)/PATCHES > patchlist.c
 

diff --git a/configure.ac b/configure.ac
index 08caad5cfa198a05372c110e6e32a3839404867a..6043afc6574e1639dbbca857136853478f6f7bc2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -812,13 +812,11 @@ if test -n "$hcache_tokyocabinet" && test "$hcache_tokyocabinet" != "no"; then
        AC_CHECK_HEADER(tcbdb.h,
        AC_CHECK_LIB(tokyocabinet, tcbdbopen,
                [
-                       MUTTLIBS="$MUTTLIBS -ltokyocabinet"
+                       HCACHE_LIBS="$HCACHE_LIBS -ltokyocabinet"
                        AC_DEFINE(HAVE_TC, 1, [Tokyo Cabinet Support])
-                       MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS hcache_tc.o"
                        hcache_db_used="tokyocabinet $hcache_db_used"
+                       build_hc_tc="yes"
                ],[
-                       CPPFLAGS="$OLDCPPFLAGS"
-                       LDFLAGS="$OLDLDFLAGS"
                        AC_MSG_ERROR(Unable to find TokyoCabinet)
                ]),     AC_MSG_ERROR(Unable to find TokyoCabinet))
 fi
@@ -835,13 +833,11 @@ if test -n "$hcache_kyotocabinet" && test "$hcache_kyotocabinet" != "no"; then
        AC_CHECK_HEADER(kclangc.h,
        AC_CHECK_LIB(kyotocabinet, kcdbopen,
                [
-                       MUTTLIBS="$MUTTLIBS -lkyotocabinet"
+                       HCACHE_LIBS="$HCACHE_LIBS -lkyotocabinet"
                        AC_DEFINE(HAVE_KC, 1, [Kyoto Cabinet Support])
-                       MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS hcache_kc.o"
                        hcache_db_used="kyotocabinet $hcache_db_used"
+                       build_hc_kc="yes"
                ],[
-                       CPPFLAGS="$OLDCPPFLAGS"
-                       LDFLAGS="$OLDLDFLAGS"
                        AC_MSG_ERROR(Unable to find KyotoCabinet)
                ]),     AC_MSG_ERROR(Unable to find KyotoCabinet))
 fi
@@ -862,13 +858,11 @@ if test -n "$hcache_gdbm" && test "$hcache_gdbm" != "no"; then
        AC_CHECK_HEADERS(gdbm.h,
        AC_CHECK_LIB(gdbm, gdbm_open,
                [
-                       MUTTLIBS="$MUTTLIBS -lgdbm"
-                       MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS hcache_gdbm.o"
+                       HCACHE_LIBS="$HCACHE_LIBS -lgdbm"
                        AC_DEFINE(HAVE_GDBM, 1, [GDBM Support])
                        hcache_db_used="gdbm $hcache_db_used"
+                       build_hc_gdbm="yes"
                ],[
-                       CPPFLAGS="$OLDCPPFLAGS"
-                       LDFLAGS="$OLDLDFLAGS"
                        AC_MSG_ERROR(Unable to find GDBM)
                ]),     AC_MSG_ERROR(Unable to find GDBM))
 fi
@@ -893,13 +887,11 @@ if test -n "$hcache_qdbm" && test "$hcache_qdbm" != "no"; then
        AC_CHECK_HEADERS(villa.h,
        AC_CHECK_LIB(qdbm, vlopen,
                [
-                       MUTTLIBS="$MUTTLIBS -lqdbm"
-                       MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS hcache_qdbm.o"
+                       HCACHE_LIBS="$HCACHE_LIBS -lqdbm"
                        AC_DEFINE(HAVE_QDBM, 1, [QDBM Support])
                        hcache_db_used="qdbm $hcache_db_used"
+                       build_hc_qdbm="yes"
                ],[
-                       CPPFLAGS="$OLDCPPFLAGS"
-                       LDFLAGS="$OLDLDFLAGS"
                        AC_MSG_ERROR(Unable to find QDBM)
                ]),     AC_MSG_ERROR(Unable to find QDBM))
 fi
@@ -935,10 +927,10 @@ if test -n "$hcache_bdb" && test "$hcache_bdb" != "no"; then
                                LDFLAGS="$OLDLDFLAGS -L$BDB_LIB_DIR"
                                AC_CHECK_LIB($BDB_LIB_NAME, db_env_create,
                                        [
-                                               MUTTLIBS="$MUTTLIBS -l$BDB_LIB_NAME"
-                                               MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS hcache_bdb.o"
+                                               HCACHE_LIBS="$HCACHE_LIBS -l$BDB_LIB_NAME"
                                                AC_DEFINE(HAVE_BDB, 1, [Berkeley DB Support])
                                                hcache_db_used="bdb $hcache_db_used"
+                                               build_hc_bdb="yes"
                                                BDB_FOUND=yes
                                                break
                                ],[
@@ -968,12 +960,10 @@ if test -n "$hcache_lmdb" && test "$hcache_lmdb" != "no"; then
        AC_CHECK_LIB(lmdb, mdb_env_create,
                [
                        AC_DEFINE(HAVE_LMDB, 1, [LMDB Support])
-                       MUTTLIBS="$MUTTLIBS -llmdb"
-                       MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS hcache_lmdb.o"
+                       HCACHE_LIBS="$HCACHE_LIBS -llmdb"
                        hcache_db_used="lmdb $hcache_db_used"
+                       build_hc_lmdb="yes"
                ],[
-                       CPPFLAGS="$OLDCPPFLAGS"
-                       LDFLAGS="$OLDLDFLAGS"
                        AC_MSG_ERROR(Unable to find LMDB)
                ]),     AC_MSG_ERROR(Unable to find LMDB))
 fi
@@ -981,12 +971,19 @@ fi
 AM_CONDITIONAL(BUILD_HCACHE, test -n "$hcache_db_used")
 if test -n "$hcache_db_used"; then
        AC_DEFINE(USE_HCACHE, 1, [Enable header caching])
-       MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS hcache.o"
+       HCACHE_LIBS="-Lhcache -lhcache $HCACHE_LIBS"
        need_md5="yes"
 else
        # For outputting in the summary
        hcache_db_used="no"
 fi
+
+AM_CONDITIONAL(BUILD_HC_BDB,  test "x$build_hc_bdb"  = "xyes")
+AM_CONDITIONAL(BUILD_HC_GDBM, test "x$build_hc_gdbm" = "xyes")
+AM_CONDITIONAL(BUILD_HC_KC,   test "x$build_hc_kc"   = "xyes")
+AM_CONDITIONAL(BUILD_HC_LMDB, test "x$build_hc_lmdb" = "xyes")
+AM_CONDITIONAL(BUILD_HC_QDBM, test "x$build_hc_qdbm" = "xyes")
+AM_CONDITIONAL(BUILD_HC_TC,   test "x$build_hc_tc"   = "xyes")
 dnl -- end cache --
 
 if test "$need_md5" = "yes"; then
@@ -999,6 +996,7 @@ AC_SUBST(MUTTLIBS)
 AC_SUBST(MUTT_LIB_OBJECTS)
 AC_SUBST(LIBIMAP)
 AC_SUBST(LIBIMAPDEPS)
+AC_SUBST(HCACHE_LIBS)
 
 dnl -- iconv/gettext --
 
@@ -1119,8 +1117,7 @@ if test x$full_doc != xno; then
 fi
 
 AC_CONFIG_FILES(Makefile contrib/Makefile doc/Makefile imap/Makefile
-       m4/Makefile po/Makefile.in
-       hcachever.sh doc/instdoc.sh)
+       m4/Makefile po/Makefile.in hcache/Makefile doc/instdoc.sh)
 AC_OUTPUT
 
 AC_MSG_NOTICE([Summary of build options:
@@ -1132,7 +1129,7 @@ AC_MSG_NOTICE([Summary of build options:
   CFlags:            ${CFLAGS} ${CPPFLAGS}
   LDFlags:           ${LDFLAGS}
   Libs:              ${LIBS}
-  Mutt libs:         ${MUTTLIBS}
+  Mutt libs:         ${MUTTLIBS} ${HCACHE_LIBS}
 
   GPGME:             $use_gpgme
   PGP:               $use_pgp

diff --git a/hcache/Makefile.am b/hcache/Makefile.am
new file mode 100644 (file)
index 0000000..8d0c958
--- /dev/null
+++ b/hcache/Makefile.am
@@ -0,0 +1,50 @@
+## Process this file with automake to produce Makefile.in
+include $(top_srcdir)/flymake.am
+
+AUTOMAKE_OPTIONS = 1.6 foreign
+
+EXTRA_DIST = bdb.c gdbm.c hcache.c kc.c lmdb.c qdbm.c tc.c hcachever.sh
+
+AM_CPPFLAGS = -I$(top_srcdir)
+
+noinst_LIBRARIES = libhcache.a
+noinst_HEADERS = backend.h hcache.h
+
+libhcache_a_SOURCES =
+
+if BUILD_HCACHE
+HCVERSION = hcversion.h
+CLEANFILES = $(HCVERSION)
+libhcache_a_SOURCES += hcache.c
+endif
+if BUILD_HC_BDB
+libhcache_a_SOURCES += bdb.c
+endif
+if BUILD_HC_GDBM
+libhcache_a_SOURCES += gdbm.c
+endif
+if BUILD_HC_KC
+libhcache_a_SOURCES += kc.c
+endif
+if BUILD_HC_LMDB
+libhcache_a_SOURCES += lmdb.c
+endif
+if BUILD_HC_QDBM
+libhcache_a_SOURCES += qdbm.c
+endif
+if BUILD_HC_TC
+libhcache_a_SOURCES += tc.c
+endif
+
+BUILT_SOURCES = $(HCVERSION)
+
+../$(MUTT_MD5):
+       +$(MAKE) -C .. $(MUTT_MD5)
+
+$(top_srcdir)/keymap_defs.h:
+       +$(MAKE) -C $(top_srcdir) keymap_defs.h
+
+hcversion.h: $(top_srcdir)/mutt.h $(top_srcdir)/rfc822.h $(srcdir)/hcachever.sh ../$(MUTT_MD5)
+       ( echo '#include "config.h"'; echo '#include "mutt.h"'; ) \
+       | $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) - | sh $(srcdir)/hcachever.sh hcversion.h
+

diff --git a/hcache/README.md b/hcache/README.md
new file mode 100644 (file)
index 0000000..668592e
--- /dev/null
+++ b/hcache/README.md
@@ -0,0 +1,13 @@
+# Header Cache
+
+These files make up NeoMutt's header cache.
+There are six different databases to choose from:
+- BerkeleyDB
+- GDBM
+- KyotoCabinet
+- LMDB
+- QDBM
+- TokyoCabinet
+
+Each backend implements the interface which is defined in `hcache.h`
+

diff --git a/hcache_backend.h b/hcache/backend.h
similarity index 100%
rename from hcache_backend.h
rename to hcache/backend.h

diff --git a/hcache_bdb.c b/hcache/bdb.c
similarity index 99%
rename from hcache_bdb.c
rename to hcache/bdb.c
index 2072e791eee6ef405ae4780bea979c9862a46798..aff5991b5d2ec7074c7e776d77292013765f2e6b 100644 (file)
--- a/hcache_bdb.c
+++ b/hcache/bdb.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include "mutt.h"
-#include "hcache_backend.h"
+#include "backend.h"
 #include "mx.h"
 
 typedef struct

diff --git a/hcache_gdbm.c b/hcache/gdbm.c
similarity index 98%
rename from hcache_gdbm.c
rename to hcache/gdbm.c
index dc200caf72c0a566b8ad69c440c03438c7b5fe2e..305991da5397e5946ad3e1205b5fc8007007ef65 100644 (file)
--- a/hcache_gdbm.c
+++ b/hcache/gdbm.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #include <gdbm.h>
 #include "mutt.h"
-#include "hcache_backend.h"
+#include "backend.h"
 
 static void *hcache_gdbm_open(const char *path)
 {

diff --git a/hcache.c b/hcache/hcache.c
similarity index 99%
rename from hcache.c
rename to hcache/hcache.c
index 5083311781c1fe107a346aad1286a675250668d1..3936a9ef31482597eb735915272637fcb9fedeca 100644 (file)
--- a/hcache.c
+++ b/hcache/hcache.c
@@ -28,7 +28,7 @@
 #include <errno.h>
 #include <sys/time.h>
 #include "hcache.h"
-#include "hcache_backend.h"
+#include "backend.h"
 #include "hcversion.h"
 #include "md5.h"
 

diff --git a/hcache.h b/hcache/hcache.h
similarity index 100%
rename from hcache.h
rename to hcache/hcache.h

diff --git a/hcachever.sh.in b/hcache/hcachever.sh
similarity index 97%
rename from hcachever.sh.in
rename to hcache/hcachever.sh
index 730ca76b8cbd597c30bb6b858360eececb6ac3cd..2eb88d08202d23e806c041430e6125bb35234534 100755 (executable)
--- a/hcachever.sh.in
+++ b/hcache/hcachever.sh
@@ -81,7 +81,7 @@ do
 done
 echo " */" >> $TMPD
 
-MD5TEXT=`echo "$TEXT" | ./mutt_md5`
+MD5TEXT=`echo "$TEXT" | ../mutt_md5`
 echo "#define HCACHEVER 0x"`echo $MD5TEXT | cut -c-8` >> $TMPD
 
 # TODO: validate we have all structs

diff --git a/hcache_kc.c b/hcache/kc.c
similarity index 99%
rename from hcache_kc.c
rename to hcache/kc.c
index bc55dfc556322dc05672078cff6014382aae3003..0f70762e570068352e79c85e7d8780d1f2c65a35 100644 (file)
--- a/hcache_kc.c
+++ b/hcache/kc.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #include <kclangc.h>
 #include "mutt.h"
-#include "hcache_backend.h"
+#include "backend.h"
 
 static void *hcache_kyotocabinet_open(const char *path)
 {

diff --git a/hcache_lmdb.c b/hcache/lmdb.c
similarity index 99%
rename from hcache_lmdb.c
rename to hcache/lmdb.c
index 6bc31ab66a72cedc4f55abff64455fd6553c975a..017da2d93939c375cebe571e7ffb263b964ac508 100644 (file)
--- a/hcache_lmdb.c
+++ b/hcache/lmdb.c
@@ -20,7 +20,7 @@
 
 #include "config.h"
 #include <lmdb.h>
-#include "hcache_backend.h"
+#include "backend.h"
 #include "lib.h"
 
 /* The maximum size of the database file (2GiB).

diff --git a/hcache_qdbm.c b/hcache/qdbm.c
similarity index 98%
rename from hcache_qdbm.c
rename to hcache/qdbm.c
index ec976fb3f6dac4236a56fac83f76d6b4915e4bfb..d4918b2c4d0e76348295775376400ce4ac9f0b48 100644 (file)
--- a/hcache_qdbm.c
+++ b/hcache/qdbm.c
@@ -23,7 +23,7 @@
 #include <depot.h>
 #include <villa.h>
 #include "mutt.h"
-#include "hcache_backend.h"
+#include "backend.h"
 
 static void *hcache_qdbm_open(const char *path)
 {

diff --git a/hcache_tc.c b/hcache/tc.c
similarity index 98%
rename from hcache_tc.c
rename to hcache/tc.c
index 30ab1bd126e30c372c01862da34c74348117597a..c360b86f260e84c52170c3ad5792ef9c5da57a64 100644 (file)
--- a/hcache_tc.c
+++ b/hcache/tc.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #include <tcbdb.h>
 #include "mutt.h"
-#include "hcache_backend.h"
+#include "backend.h"
 
 static void *hcache_tokyocabinet_open(const char *path)
 {

diff --git a/imap/imap.c b/imap/imap.c
index 8c8194ab2176e9c2c7b2ddd1a288c3f1aac22205..cdc4f7a7d293a99710716371cc84c7110b958f8a 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -35,7 +35,7 @@
 #include "mx.h"
 #include "sort.h"
 #ifdef USE_HCACHE
-#include "hcache.h"
+#include "hcache/hcache.h"
 #endif
 #ifdef USE_SSL
 #include "mutt_ssl.h"

diff --git a/imap/imap_private.h b/imap/imap_private.h
index 4a8630375d0a7499c31b0293873ae0a25341226f..a1844353b18c53f9a8daa9cbc51100af62119945 100644 (file)
--- a/imap/imap_private.h
+++ b/imap/imap_private.h
@@ -26,7 +26,7 @@
 #include "mutt_curses.h"
 #include "mutt_socket.h"
 #ifdef USE_HCACHE
-#include "hcache.h"
+#include "hcache/hcache.h"
 #endif
 
 /* -- symbols -- */

diff --git a/imap/message.c b/imap/message.c
index 854fd761a14b99bc83fdf68de18678330cf72b24..8f607c9bfd26746af0088576480c42f01a6a02cd 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -27,7 +27,7 @@
 #include "bcache.h"
 #include "mx.h"
 #ifdef USE_HCACHE
-#include "hcache.h"
+#include "hcache/hcache.h"
 #endif
 
 static void imap_update_context(IMAP_DATA *idata, int oldmsgcount)

diff --git a/imap/util.c b/imap/util.c
index bcd8f7049fbcd82e9202557c4356c07f746ace9c..62572d146c2e90edeff0adc6f4e566d44f7447c0 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -33,7 +33,7 @@
 #include "mx.h"
 #include "url.h"
 #ifdef USE_HCACHE
-#include "hcache.h"
+#include "hcache/hcache.h"
 #endif
 
 /* -- public functions -- */

diff --git a/main.c b/main.c
index 761ef2ee3775816d770858b36d2633b5efa2b02b..a57fc37f0a83617d96a4948465693ee33ce558c3 100644 (file)
--- a/main.c
+++ b/main.c
@@ -45,13 +45,12 @@
 #include "imap/imap.h"
 #endif
 #ifdef USE_HCACHE
-#include "hcache.h"
+#include "hcache/hcache.h"
 #endif
 #ifdef USE_NNTP
 #include "nntp.h"
 #endif
 
-
 #ifdef HAVE_STRINGPREP_H
 #include <stringprep.h>
 #elif defined(HAVE_IDN_STRINGPREP_H)

diff --git a/mh.c b/mh.c
index f26e16857881ee2c919dffadb1e454b6301f4a72..e98148e132d00f2bac79ad154df0eb0dcc2c1b8d 100644 (file)
--- a/mh.c
+++ b/mh.c
@@ -50,7 +50,7 @@
 #include "mutt_notmuch.h"
 #endif
 #ifdef USE_HCACHE
-#include "hcache.h"
+#include "hcache/hcache.h"
 #endif
 
 #define INS_SORT_THRESHOLD 6

diff --git a/mx.h b/mx.h
index 68215fba99b496cbb03e6fb56e5779a18a37c7c1..2a7d061e8df6f03e8b67675081e837aec6da10f6 100644 (file)
--- a/mx.h
+++ b/mx.h
@@ -60,7 +60,7 @@ void maildir_update_flags(CONTEXT *ctx, HEADER *o, HEADER *n);
 void maildir_flags(char *dest, size_t destlen, HEADER *hdr);
 
 #ifdef USE_HCACHE
-#include "hcache.h"
+#include "hcache/hcache.h"
 int mh_sync_mailbox_message(CONTEXT *ctx, int msgno, header_cache_t *hc);
 #else
 int mh_sync_mailbox_message(CONTEXT *ctx, int msgno);

diff --git a/newsrc.c b/newsrc.c
index 97339ccb2cbbc8d158a1f6280ea40f479667176e..a8e635ceb84677b921698c258a4b6d78a6d05dbe 100644 (file)
--- a/newsrc.c
+++ b/newsrc.c
@@ -38,7 +38,7 @@
 #include "rfc822.h"
 #include "sort.h"
 #ifdef USE_HCACHE
-#include "hcache.h"
+#include "hcache/hcache.h"
 #endif
 
 /* Find NNTP_DATA for given newsgroup or add it */

diff --git a/nntp.c b/nntp.c
index e2884f0016e433d5176071b7ad3667cd511b5172..f663595ea7f25b3abed9d23be414abbc705911f4 100644 (file)
--- a/nntp.c
+++ b/nntp.c
@@ -36,7 +36,7 @@
 #include "mutt_ssl.h"
 #endif
 #ifdef USE_HCACHE
-#include "hcache.h"
+#include "hcache/hcache.h"
 #endif
 #ifdef USE_SASL
 #include <sasl/sasl.h>

diff --git a/nntp.h b/nntp.h
index 1e764bb7945db40f99316f13bc4bf9acd8e8d4c3..cc25cdfe89539530236dedec720a85e05e0a2fa0 100644 (file)
--- a/nntp.h
+++ b/nntp.h
@@ -27,7 +27,7 @@
 #include "mailbox.h"
 #include "mutt_socket.h"
 #ifdef USE_HCACHE
-#include "hcache.h"
+#include "hcache/hcache.h"
 #endif
 
 #define NNTP_PORT 119

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4723637b19ae9a8b831d4eeaa8a3a28acd7ebbfe..588670201bc5e45a62de7d5fc6b77d90189c828e 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -40,13 +40,13 @@ gnupgparse.c
 group.c
 handler.c
 hash.c
-hcache.c
-hcache_bdb.c
-hcache_gdbm.c
-hcache_kc.c
-hcache_lmdb.c
-hcache_qdbm.c
-hcache_tc.c
+hcache/hcache.c
+hcache/bdb.c
+hcache/gdbm.c
+hcache/kc.c
+hcache/lmdb.c
+hcache/qdbm.c
+hcache/tc.c
 hdrline.c
 headers.c
 help.c

diff --git a/pop.c b/pop.c
index 48f29abde97250e7de8c6656a689f0b9c1e724d2..29a282173443344210c342cf6b00dd867a7f1244 100644 (file)
--- a/pop.c
+++ b/pop.c
@@ -27,7 +27,7 @@
 #include "mutt_curses.h"
 #include "mx.h"
 #ifdef USE_HCACHE
-#include "hcache.h"
+#include "hcache/hcache.h"
 #endif
 
 #ifdef USE_HCACHE

diff --git a/version.c b/version.c
index 2967bdc3fe4aa53b11f08837b738646f3101fd62..58870853d3f08b5304848d0c25db7bac65a3e65d 100644 (file)
--- a/version.c
+++ b/version.c
@@ -34,7 +34,7 @@
 /* #include "protos.h" */
 const char *mutt_make_version(void);
 void mutt_print_patchlist(void);
-/* #include "hcache.h" */
+/* #include "hcache/hcache.h" */
 const char *mutt_hcache_backend_list(void);
 
 const int SCREEN_WIDTH = 80;