X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=4a1fe591a901b9b7d07a2e5d3a659103f122906f;hp=18f3079a1f05ac23a437ebfe530cb83c36e71587;hb=0c73c9a8dd4f023a9d2cce2e72904e8bbc9ade3e;hpb=4c99e2f0c403adb86af688ea982350de5bcc5edf

diff --git a/main.c b/main.c
index 18f3079..4a1fe59 100644
--- a/main.c
+++ b/main.c
@@ -23,10 +23,10 @@
 #include <lib-sys/mutt_signal.h>
 #include <lib-mime/mime.h>
 #include <lib-ui/curses.h>
-#include <lib-crypt/crypt.h>
 #include <lib-mx/mx.h>
 
 #include "mutt.h"
+#include "crypt.h"
 #include "alias.h"
 #include "buffy.h"
 #include "sort.h"
@@ -66,9 +66,7 @@ extern int optind;
 #include <gnutls/gnutls.h>
 #endif
 
-#ifdef CRYPT_BACKEND_GPGME
 #include <gpgme.h>
-#endif
 
 #ifdef USE_SSL
 #include <openssl/opensslv.h>
@@ -199,10 +197,7 @@ static void show_version (void)
   printf ("  %s\n",OPENSSL_VERSION_TEXT);
 #endif
 
-#ifdef CRYPT_BACKEND_GPGME
   printf ("  gpgme %s\n", GPGME_VERSION);
-#endif
-
   puts (_("Compile Options:"));
 
   puts (
@@ -304,11 +299,7 @@ static void show_version (void)
     );
 
   puts (
-#ifdef CRYPT_BACKEND_GPGME
          "+CRYPT_BACKEND_GPGME  "
-#else
-         "-CRYPT_BACKEND_GPGME  "
-#endif
          "\n  "
 #ifdef ENABLE_NLS
          "+ENABLE_NLS  "
@@ -589,9 +580,6 @@ int main (int argc, char **argv)
   mutt_init (flags & M_NOSYSRC, commands);
   string_list_wipe(&commands);
 
-  /* Initialize crypto */
-  crypt_init ();
-
   if (queries)
     return mutt_query_variables (queries);
   if (dump_variables > 0)