X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=e0c00f2ce478141fad5f41b2c7f7bab8c81a5d56;hp=2e1b4d447b1a94fcccb0f85bca0d7281250044c8;hb=c855a6e8e9522ac9add840b18a869c831030f569;hpb=d4b790a79307b4f53c49f4c25223977a8baa6aa1

diff --git a/main.c b/main.c
index 2e1b4d4..e0c00f2 100644
--- a/main.c
+++ b/main.c
@@ -214,74 +214,11 @@ static void show_version (void)
          "+USE_LIBESMTP  "
 #else
          "-USE_LIBESMTP  "
-#endif
-         "\n  "
-#ifdef HAVE_REGCOMP
-         "+HAVE_REGCOMP  "
-#else
-         "-HAVE_REGCOMP  "
-#endif
-         "\n  "
-#ifdef HAVE_TYPEAHEAD
-         "+HAVE_TYPEAHEAD  "
-#else
-         "-HAVE_TYPEAHEAD  "
-#endif
-#ifdef HAVE_BKGDSET
-         "+HAVE_BKGDSET  "
-#else
-         "-HAVE_BKGDSET  "
-#endif
-         "\n  "
-#ifdef HAVE_CURS_SET
-         "+HAVE_CURS_SET  "
-#else
-         "-HAVE_CURS_SET  "
-#endif
-#ifdef HAVE_META
-         "+HAVE_META  "
-#else
-         "-HAVE_META  "
-#endif
-#ifdef HAVE_RESIZETERM
-         "+HAVE_RESIZETERM  "
-#else
-         "-HAVE_RESIZETERM  "
-#endif
-    );
-
-  puts (
-         "+CRYPT_BACKEND_GPGME  "
-         "\n  "
-#ifdef ENABLE_NLS
-         "+ENABLE_NLS  "
-#else
-         "-ENABLE_NLS  "
-#endif
-#ifdef HAVE_WC_FUNCS
-         "+HAVE_WC_FUNCS  "
-#else
-         "-HAVE_WC_FUNCS  "
-#endif
-#ifdef HAVE_LANGINFO_CODESET
-         "+HAVE_LANGINFO_CODESET  "
-#else
-         "-HAVE_LANGINFO_CODESET  "
-#endif
-#ifdef HAVE_ICONV
-         "+HAVE_ICONV  "
-#else
-         "-HAVE_ICONV  "
 #endif
 #ifdef HAVE_LIBIDN
          "+HAVE_LIBIDN  "
 #else
          "-HAVE_LIBIDN  "
-#endif
-#ifdef HAVE_GETSID
-         "+HAVE_GETSID  "
-#else
-         "-HAVE_GETSID  "
 #endif
     );
 
@@ -378,13 +315,9 @@ int main (int argc, char **argv)
     exit (1);
   }
 
-#ifdef ENABLE_NLS
-  /* FIXME what about init.c:1439 ? */
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, MUTTLOCALEDIR);
   textdomain (PACKAGE);
-#endif
-
   setlocale (LC_CTYPE, "");
 
   mutt_error = mutt_message = mutt_nocurses_error;