X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=1db6a4081bffd9d840de2a8a26a22ad6f4b99d41;hp=72166ea0fd8b1a4fcf306a98072db496319a6746;hb=bda23e0682020cf22af0e4b769dd93d77d70f07a;hpb=c81a65db2499a363af5af28610db5f7e69e15839

diff --git a/main.c b/main.c
index 72166ea..1db6a40 100644
--- a/main.c
+++ b/main.c
@@ -46,8 +46,8 @@ extern int optind;
 #endif
 
 #ifdef USE_HCACHE
-#if defined(HAVE_QDBM)
-#include <depot.h>
+#if defined(HAVE_TOKYOCABINET)
+#include <tcutil.h>
 #elif defined(HAVE_GDBM)
 #include <gdbm.h>
 #endif
@@ -64,7 +64,7 @@ void mutt_exit(int code)
 
 static void mutt_usage (void)
 {
-    puts(mutt_make_version());
+    puts(madmutt_version);
 
     puts(_("\
 usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -f <file> ]\n\
@@ -98,7 +98,7 @@ static void show_version (void)
     struct utsname uts;
     uname(&uts);
 
-    puts(mutt_make_version());
+    puts(madmutt_version);
     puts(_("  Copyright (C) 1996-2002 Michael R. Elkins and others."));
     puts(_("  Copyright (C) 2005      The Mutt-ng Team"));
     puts(_("  Copyright (C) 2006-2007 Pierre Habouzit"));
@@ -118,8 +118,8 @@ static void show_version (void)
     printf("  libidn %s\n", STRINGPREP_VERSION);
 #endif
 #ifdef USE_HCACHE
-#if defined(HAVE_QDBM)
-    printf("  qdbm %s\n", dpversion);
+#if defined(HAVE_TOKYOCABINET)
+    printf("  tokyocabinet %s\n", tcversion);
 #elif defined(HAVE_GDBM)
     printf("  gdbm %s\n", gdbm_version);
 #endif
@@ -129,16 +129,6 @@ static void show_version (void)
     puts (_("Compile Options:"));
 
     puts (
-#ifdef USE_FCNTL
-        "  +USE_FCNTL"
-#else
-        "  -USE_FCNTL"
-#endif
-#ifdef USE_FLOCK
-        "  +USE_FLOCK"
-#else
-        "  -USE_FLOCK"
-#endif
 #ifdef USE_HCACHE
         "  +USE_HCACHE"
 #else