less and less cruft: always compile socket support in

[apps/madmutt.git] / init.h

diff --git a/init.h b/init.h
index bbab713..480212a 100644 (file)
--- a/init.h
+++ b/init.h
@@ -93,9 +93,6 @@ struct option_t {
 # ifndef USE_SSL
 #  define USE_SSL
 # endif
-# ifndef USE_SOCKET
-#  define USE_SOCKET
-# endif
 # ifndef USE_LIBESMTP
 #  define USE_LIBESMTP
 # endif
@@ -108,9 +105,6 @@ struct option_t {
 # ifndef USE_DOTLOCK
 #  define USE_DOTLOCK
 # endif
-# ifndef DL_STANDALONE
-#  define DL_STANDALONE
-# endif
 # ifndef USE_HCACHE
 #  define USE_HCACHE
 # endif
@@ -597,11 +591,11 @@ struct option_t MuttVars[] = {
    ** is viewed it is passed as standard input to $$display_filter, and the
    ** filtered message is read from the standard output.
    */
-#if defined(DL_STANDALONE) && defined(USE_DOTLOCK)
+#if defined(USE_DOTLOCK)
   {"dotlock_program", DT_PATH, R_NONE, UL &MuttDotlock, "$muttng_bindir/muttng_dotlock"},
   /*
    ** .pp
-   ** Availability: Standalone and Dotlock
+   ** Availability: Dotlock
    **
    ** .pp
    ** Contains the path of the \fTmuttng_dotlock(1)\fP binary to be used by
@@ -1930,7 +1924,6 @@ struct option_t MuttVars[] = {
    ** was connection lost.
    */
 #endif
-#ifdef USE_SOCKET
   { "net_inc", DT_NUM, R_NONE, UL &NetInc, "10" },
   /*
   ** .pp
@@ -1940,7 +1933,6 @@ struct option_t MuttVars[] = {
   ** .pp
   ** See also ``$$read_inc'' and ``$$write_inc''.
   */
-#endif 
   {"pager", DT_PATH, R_NONE, UL &Pager, "builtin"},
   /*
    ** .pp
@@ -2789,7 +2781,7 @@ struct option_t MuttVars[] = {
    ** This variable configures how often (in seconds) Mutt-ng should look for
    ** new mail.
    */
-  {"pop_delete(", DT_QUAD, R_NONE, OPT_POPDELETE, "ask-no" },
+  {"pop_delete", DT_QUAD, R_NONE, OPT_POPDELETE, "ask-no" },
   /*
    ** .pp
    ** Availability: POP
@@ -2892,7 +2884,6 @@ struct option_t MuttVars[] = {
    ** in the mailbox specified by this variable.  Also see the ``$$postpone''
    ** variable.
    */
-#ifdef USE_SOCKET
   {"preconnect", DT_STR, R_NONE, UL &Preconnect, "" },
   /*
    ** .pp
@@ -2910,7 +2901,6 @@ struct option_t MuttVars[] = {
    ** \fBNote:\fP For this example to work, you must be able to log in to the
    ** remote machine without having to enter a password.
    */
-#endif /* USE_SOCKET */
   {"print", DT_QUAD, R_NONE, OPT_PRINT, "ask-no" },
   /*
    ** .pp
@@ -3674,7 +3664,6 @@ struct option_t MuttVars[] = {
    ** \fBNote\fP: When you delete a message in the trash folder, it is really
    ** deleted, so that there is no way to recover mail.
    */
-#ifdef USE_SOCKET
   {"tunnel", DT_STR, R_NONE, UL &Tunnel, "" },
   /*
    ** .pp
@@ -3687,7 +3676,6 @@ struct option_t MuttVars[] = {
    ** \fBNote:\fP For this example to work you must be able to log in to the remote
    ** machine without having to enter a password.
    */
-#endif
   {"umask", DT_NUM, R_NONE, UL &Umask, "0077" },
   /*
    ** .pp
@@ -3873,9 +3861,6 @@ static const char* Features[] = {
 #ifdef USE_DOTLOCK
   "dotlock",
 #endif
-#ifdef DL_STANDALONE
-  "standalone",
-#endif
 #ifdef USE_POP
   "pop",
 #endif
@@ -3897,18 +3882,9 @@ static const char* Features[] = {
 #ifdef USE_LIBESMTP
   "libesmtp",
 #endif
-#ifdef USE_COMPRESSED
-  "compessed",
-#endif
 #ifdef HAVE_COLOR
   "color",
 #endif
-#ifdef CRYPT_BACKEND_CLASSIC_PGP
-  "classic_pgp",
-#endif
-#ifdef CRYPT_BACKEND_CLASSIC_SMIME
-  "class_smime",
-#endif
 #ifdef CRYPT_BACKEND_GPGME
   "gpgme",
 #endif
@@ -4022,9 +3998,7 @@ struct command_t Commands[] = {
   {"attachments", parse_attachments, 0 },
   {"unattachments",parse_unattachments,0 },
   {"unalternates", parse_unalternates, 0},
-#ifdef USE_SOCKET
   {"account-hook", mutt_parse_hook, M_ACCOUNTHOOK},
-#endif
   {"alias", parse_alias, 0},
   {"auto_view", parse_list, UL &AutoViewList},
   {"alternative_order", parse_list, UL &AlternativeOrderList},
@@ -4038,11 +4012,9 @@ struct command_t Commands[] = {
   {"fcc-hook", mutt_parse_hook, M_FCCHOOK},
   {"fcc-save-hook", mutt_parse_hook, M_FCCHOOK|M_SAVEHOOK},
   {"folder-hook", mutt_parse_hook, M_FOLDERHOOK},
-#ifdef USE_COMPRESSED
   {"open-hook", mutt_parse_hook, M_OPENHOOK},
   {"close-hook", mutt_parse_hook, M_CLOSEHOOK},
   {"append-hook", mutt_parse_hook, M_APPENDHOOK},
-#endif
   {"hdr_order", parse_list, UL &HeaderOrderList},
   {"ifdef", parse_ifdef, 1},
   {"ifndef", parse_ifdef, 0},