Rocco Rutte:

- don't try to install README.SECURITY as it has been removed
- cleanup of -v output (maybe more to come)

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@282 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/Makefile.am b/Makefile.am
index 0f33a55..8fae87c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -84,7 +84,7 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
        mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \
        mbox.h mh.h mx.h pager.h pgp.h protos.h reldate.h rfc1524.h rfc2047.h \
        rfc2231.h rfc822.h sha1.h sort.h mime.types VERSION prepare \
-       _regex.h OPS.MIX README.SECURITY remailer.c remailer.h browser.h \
+       _regex.h OPS.MIX remailer.c remailer.h browser.h \
        mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttngrc.head Muttngrc \
        makedoc.c stamp-doc-rc README.SSL smime.h\
        muttngbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh       \

diff --git a/main.c b/main.c
index a6e848f..ce8c1be 100644 (file)
--- a/main.c
+++ b/main.c
@@ -227,6 +227,11 @@ static void show_version (void)
          "+USE_INODESORT   "
 #else
          "-USE_INODESORT   "
+#endif
+#if USE_HCACHE
+         "+USE_HCACHE  "
+#else
+         "-USE_HCACHE  "
 #endif
     );
   puts (
@@ -245,11 +250,6 @@ static void show_version (void)
 #else
          "-USE_IMAP  "
 #endif
-#ifdef IMAP_EDIT_THREADS
-         "+IMAP_EDIT_THREADS  "
-#else
-         "-IMAP_EDIT_THREADS  "
-#endif
 #ifdef USE_GSS
          "+USE_GSS  "
 #else
@@ -265,11 +265,6 @@ static void show_version (void)
 #else
          "-USE_GNUTLS  "
 #endif
-#ifdef USE_GNUTLS
-         "+USE_GNUTLS  "
-#else
-         "-USE_GNUTLS  "
-#endif
 #ifdef USE_SASL
          "+USE_SASL  "
 #else
@@ -422,16 +417,6 @@ static void show_version (void)
          "+HAVE_GETADDRINFO  "
 #else
          "-HAVE_GETADDRINFO  "
-#endif
-#if USE_HCACHE
-         "+USE_HCACHE  "
-#else
-         "-USE_HCACHE  "
-#endif
-#if USE_HCACHE
-         "+USE_HCACHE  "
-#else
-         "-USE_HCACHE  "
 #endif
     );
 
@@ -454,6 +439,7 @@ static void show_version (void)
 
   puts (_(ReachingUs));
 
+  puts (_("Mutt-ng is based on the following patches written for mutt:\n"));
   mutt_print_patchlist ();
 
   exit (0);