take more cruft to the bin

[apps/madmutt.git] / main.c

diff --git a/main.c b/main.c
index adb387d..371c557 100644 (file)
--- a/main.c
+++ b/main.c
@@ -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  "
@@ -354,13 +345,6 @@ static void show_version (void)
     );
 
   puts (_("Built-In Defaults:"));
-
-#ifdef ISPELL
-  printf ("  +ISPELL=\"%s\"\n", ISPELL);
-#else
-  puts ("  -ISPELL");
-#endif
-
   printf ("  +SENDMAIL=\"%s\"\n", SENDMAIL);
   printf ("  +MAILPATH=\"%s\"\n", MAILPATH);
   printf ("  +PKGDATADIR=\"%s\"\n", PKGDATADIR);
@@ -724,7 +708,7 @@ int main (int argc, char **argv)
 
       /* is the following if still needed? */
 
-      fout = m_tempfile(buf, sizeof(buf), NONULL(Tempdir), NULL);
+      fout = m_tempfile(buf, sizeof(buf), NONULL(MCore.tmpdir), NULL);
       tempfile = m_strdup(buf);
 
       if (tempfile) {
@@ -851,6 +835,6 @@ int main (int argc, char **argv)
     mutt_endwin (Errorbuf);
   }
 
-  mlua_shutdown();
+  luaM_shutdown();
   exit (0);
 }