X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=main.c;h=3596712b181cf99217250014839b096dfa3e4dfa;hb=b8c71f93b0296f815a6538182343ba67e88c0012;hp=a2fad56f630db50682b656432064e87a0059552d;hpb=83532821ae9fab034d0d630b78330c9ea4ff4cf3;p=apps%2Fmadmutt.git

diff --git a/main.c b/main.c
index a2fad56..3596712 100644
--- a/main.c
+++ b/main.c
@@ -284,12 +284,6 @@ static void show_version (void)
 #else
          "-USE_DOTLOCK  "
 #endif
-#ifdef DL_STANDALONE
-         "+DL_STANDALONE  "
-#else
-         "-DL_STANDALONE  "
-#endif
-         "\n  "
 #ifdef USE_FCNTL
          "+USE_FCNTL  "
 #else
@@ -300,11 +294,6 @@ static void show_version (void)
 #else
          "-USE_FLOCK   "
 #endif
-#ifdef USE_INODESORT
-         "+USE_INODESORT   "
-#else
-         "-USE_INODESORT   "
-#endif
 #ifdef USE_HCACHE
          "+USE_HCACHE  "
 #else
@@ -312,21 +301,11 @@ static void show_version (void)
 #endif
     );
   puts (
-#ifdef USE_POP
-         "  +USE_POP  "
-#else
-         "  -USE_POP  "
-#endif
 #ifdef USE_NNTP
          "+USE_NNTP  "
 #else
          "-USE_NNTP  "
 #endif
-#ifdef USE_IMAP
-         "+USE_IMAP  "
-#else
-         "-USE_IMAP  "
-#endif
 #ifdef USE_GSS
          "+USE_GSS  "
 #else
@@ -362,11 +341,6 @@ static void show_version (void)
          "+USE_GNU_REGEX  "
 #else
          "-USE_GNU_REGEX  "
-#endif
-#ifdef USE_COMPRESSED
-         "+COMPRESSED  "
-#else
-         "-COMPRESSED  "
 #endif
          "\n  "
 #ifdef HAVE_COLOR
@@ -408,16 +382,6 @@ static void show_version (void)
     );
 
   puts (
-#ifdef CRYPT_BACKEND_CLASSIC_PGP
-         "  +CRYPT_BACKEND_CLASSIC_PGP  "
-#else
-         "  -CRYPT_BACKEND_CLASSIC_PGP  "
-#endif
-#ifdef CRYPT_BACKEND_CLASSIC_SMIME
-         "+CRYPT_BACKEND_CLASSIC_SMIME  "
-#else
-         "-CRYPT_BACKEND_CLASSIC_SMIME  "
-#endif
 #ifdef CRYPT_BACKEND_GPGME
          "+CRYPT_BACKEND_GPGME  "
 #else
@@ -427,11 +391,6 @@ static void show_version (void)
          "+BUFFY_SIZE "
 #else
          "-BUFFY_SIZE "
-#endif
-#ifdef SUN_ATTACHMENT
-         "+SUN_ATTACHMENT  "
-#else
-         "-SUN_ATTACHMENT  "
 #endif
          "\n  "
 #ifdef ENABLE_NLS
@@ -439,11 +398,6 @@ static void show_version (void)
 #else
          "-ENABLE_NLS  "
 #endif
-#ifdef LOCALES_HACK
-         "+LOCALES_HACK  "
-#else
-         "-LOCALES_HACK  "
-#endif
 #ifdef HAVE_WC_FUNCS
          "+HAVE_WC_FUNCS  "
 #else
@@ -489,12 +443,6 @@ static void show_version (void)
 
   puts (_("Built-In Defaults:"));
 
-#ifdef DOMAIN
-  printf ("  +DOMAIN=\"%s\"\n", DOMAIN);
-#else
-  puts ("  -DOMAIN");
-#endif
-
 #ifdef ISPELL
   printf ("  +ISPELL=\"%s\"\n", ISPELL);
 #else
@@ -506,7 +454,6 @@ static void show_version (void)
   printf ("  +PKGDATADIR=\"%s\"\n", PKGDATADIR);
   printf ("  +PKGDOCDIR=\"%s\"\n", PKGDOCDIR);
   printf ("  +SYSCONFDIR=\"%s\"\n", SYSCONFDIR);
-  printf ("  +EXECSHELL=\"%s\"\n", EXECSHELL);
 #ifdef MIXMASTER
   printf ("  +MIXMASTER=\"%s\"\n\n", MIXMASTER);
 #else
@@ -822,10 +769,8 @@ int main (int argc, char **argv)
 
     m_strcpy(fpath, sizeof(fpath), Maildir);
     mutt_expand_path (fpath, sizeof (fpath));
-#ifdef USE_IMAP
     /* we're not connected yet - skip mail folder creation */
     if (mx_get_magic (fpath) != M_IMAP)
-#endif
       if (stat (fpath, &sb) == -1 && errno == ENOENT) {
         snprintf (msg, sizeof (msg), _("%s does not exist. Create it?"),
                   Maildir);