Moved gcc warning options from AM_CFLAGS back to CFLAGS, to

[nmh] / uip / inc.c

diff --git a/uip/inc.c b/uip/inc.c
index 43ae88d475e5334f7a42b79ffa6a3eaaa8021963..8a71eb22aab4ccd0eaa8c55c295401643efd3fe9 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -43,12 +43,6 @@
 #include <h/tws.h>
 #include <h/mts.h>
 
-#ifndef CYRUS_SASL
-# define SASLminc(a) (a)
-#else
-# define SASLminc(a)  0
-#endif
-
 #ifndef TLS_SUPPORT
 # define TLSminc(a) (a)
 #else
@@ -75,13 +69,13 @@
     X("width columns", 0, WIDTHSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
-    X("snoop", -5, SNOOPSW) \
-    X("sasl", SASLminc(5), SASLSW) \
-    X("nosasl", SASLminc(3), NOSASLSW) \
-    X("saslmech", SASLminc(5), SASLMECHSW) \
+    X("snoop", 0, SNOOPSW) \
+    X("sasl", 0, SASLSW) \
+    X("nosasl", 0, NOSASLSW) \
+    X("saslmech", 0, SASLMECHSW) \
     X("initialtls", TLSminc(-10), INITTLSSW) \
-    X("notls", TLSminc(-12), NOTLSSW) \
-    X("authservice", SASLminc(0), AUTHSERVICESW) \
+    X("notls", TLSminc(-5), NOTLSSW) \
+    X("authservice", 0, AUTHSERVICESW) \
     X("proxy command", 0, PROXYSW) \
 
 #define X(sw, minchars, id) id,
@@ -219,7 +213,7 @@ main (int argc, char **argv)
 
     if (nmh_init(argv[0], 1)) { return 1; }
 
-    mts_init (invo_name);
+    mts_init ();
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;