X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.ac;h=3d3b90438389456f7dcd07b784ebb80ee35e063e;hp=f9ee0ffb1c0d674d3c75932e568f0c57b8f020a2;hb=2891636277fb96f992eaf08b4e6acc11ca9ea57c;hpb=51c07577bff89fde3038940cc06ac01bc28557b9

diff --git a/configure.ac b/configure.ac
index f9ee0ff..3d3b904 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,22 +127,6 @@ dnl ---------------- gpgme ----------------
     AC_SUBST(LIBGPGME_CFLAGS)
     AC_SUBST(LIBGPGME_LIBS)
 
-
-dnl ---------------- pgp/smime ----------------
-
-    AC_ARG_ENABLE(smime, AC_HELP_STRING([--disable-smime], [Disable SMIME support]),
-    [	if test x$enableval = xno ; then
-            have_smime=no
-        fi
-    ])
-
-    if test x$have_smime != xno ; then
-        AC_DEFINE(CRYPT_BACKEND_CLASSIC_SMIME,1, [ Define if you want clasic S/MIME support. ])
-        MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS smime.o crypt-mod-smime-classic.o"
-        SMIMEAUX_TARGET="smime_keysng"
-    fi
-
-
 dnl ---------------- mixmaster ----------------
 
     AC_ARG_WITH(mixmaster, AC_HELP_STRING([--with-mixmaster[=PATH]], [Include Mixmaster support]),
@@ -160,9 +144,6 @@ dnl ---------------- mixmaster ----------------
 OPS="$OPS \$(srcdir)/OPS.PGP \$(srcdir)/OPS.SMIME \$(srcdir)/OPS.CRYPT "
 AC_SUBST([OPS])
 
-
-AC_SUBST(SMIMEAUX_TARGET)
-
 AC_PATH_PROG(ISPELL, ispell, no)
 if test $ISPELL != no; then
     AC_DEFINE_UNQUOTED(ISPELL,"$ISPELL",[ Where to find ispell on your system. ])
@@ -671,27 +652,8 @@ if test x$ac_cv_dirent_d_ino = xyes ; then
 fi
 AC_MSG_RESULT($ac_cv_dirent_d_ino)
 
-dnl This may look cumbersome -- please keep it that way, so we can
-dnl quickly change the default to "yes" again.
-mutt_cv_inodesort=no
-AC_ARG_ENABLE(inodesort,  AC_HELP_STRING([--enable-inodesort], [Read files in maildir folders sorted by inode.]),
-       [if test x$enableval = xyes -a x$ac_cv_dirent_d_ino = xyes ; then mutt_cv_inodesort=yes; fi])
-
-if test $mutt_cv_inodesort = yes; then
-	AC_DEFINE(USE_INODESORT, 1, [ Define to sort files in a	maildir by inode number. ])
-fi
-
-mutt_cv_warnings=yes
-AC_ARG_ENABLE(warnings, AC_HELP_STRING([--disable-warnings], [Turn off compiler warnings (not recommended)]),
-[if test $enableval = no; then
-        mutt_cv_warnings=no
-fi])
-
-if test x$GCC = xyes -a $mutt_cv_warnings = yes; then
-        CFLAGS="-Wall -pedantic $CFLAGS"
-fi
-
-AC_ARG_ENABLE(nfs-fix, AC_HELP_STRING([--enable-nfs-fix], [Work around an NFS with broken attributes caching]),
+AC_ARG_ENABLE(nfs-fix, AC_HELP_STRING([--enable-nfs-fix],
+              [Work around an NFS with broken attributes caching]),
         [if test x$enableval = xyes; then
                 AC_DEFINE(NFS_ATTRIBUTE_HACK,1,
                   [Define if you have problems with mutt not detecting
@@ -704,11 +666,6 @@ AC_ARG_ENABLE(buffy-size, AC_HELP_STRING([--enable-buffy-size], [Use file size a
                 AC_DEFINE(BUFFY_SIZE,1,[ Define to enable the "buffy_size" feature. ])
         fi])
 
-AC_ARG_ENABLE(mailtool, AC_HELP_STRING([--enable-mailtool], [Enable Sun mailtool attachments support ]),
-        [if test x$enableval = xyes; then
-                AC_DEFINE(SUN_ATTACHMENT,1,[ Define to enable Sun mailtool attachments support. ])
-        fi])
-
 AC_ARG_ENABLE(compressed, [  --enable-compressed        Enable compressed folders support ],
         [if test x$enableval = xyes; then
                 AC_DEFINE(USE_COMPRESSED,1,[ The compressed mailboxes support ])