X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=configure.in;h=f7af21486a1ca0fb4cf0bbe3695c5de8cbe3ac61;hb=616031722dea23d357d8b50d41ae7b40cfdd7d3c;hp=52e4d75319aed92170ab9178a969ef32fb4996cf;hpb=6ae7bf50506bd40e5469719299464bdf5bc867bd;p=apps%2Fmadmutt.git

diff --git a/configure.in b/configure.in
index 52e4d75..f7af214 100644
--- a/configure.in
+++ b/configure.in
@@ -628,36 +628,6 @@ fi
 
 AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes)
 
-AC_ARG_WITH(sasl, AC_HELP_STRING([--with-sasl[=PFX]], [Use Cyrus SASL library for POP/IMAP authentication]),
-        [
-        if test "$with_sasl" != "no" -a "$need_imap" != "yes" -a "$need_pop" != "yes"
-        then
-          AC_MSG_ERROR([SASL support is only useful with POP or IMAP support])
-        fi
-
-        if test "$with_sasl" != "no"
-        then
-          if test "$with_sasl" != "yes"
-          then
-            CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
-            LDFLAGS="$LDFLAGS -L$with_sasl/lib"
-          fi
-
-          saved_LIBS="$LIBS"
-
-          AC_CHECK_LIB(sasl, sasl_client_init,,
-            AC_MSG_ERROR([could not find libsasl]),)
-
-          MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_sasl.o"
-          MUTTLIBS="$MUTTLIBS -lsasl"
-          LIBS="$saved_LIBS"
-          AC_DEFINE(USE_SASL,1,
-                  [ Define if want to use the Cyrus SASL library for POP/IMAP authentication. ])
-          need_sasl=yes
-        fi
-        ])
-AM_CONDITIONAL(USE_SASL, test x$need_sasl = xyes)
-
 AC_ARG_WITH(sasl2, AC_HELP_STRING([--with-sasl2[=PFX]], [Use Cyrus SASL library version 2 for POP/IMAP authentication]),
         [
         if test "$with_sasl2" != "no" -a "$need_imap" != "yes" -a "$need_pop" != "yes"
@@ -682,8 +652,6 @@ AC_ARG_WITH(sasl2, AC_HELP_STRING([--with-sasl2[=PFX]], [Use Cyrus SASL library
           MUTTLIBS="$MUTTLIBS -lsasl2"
           LIBS="$saved_LIBS"
           AC_DEFINE(USE_SASL,1,
-                  [ Define if want to use the Cyrus SASL library for POP/IMAP authentication. ])
-          AC_DEFINE(USE_SASL2,1,
                   [ Define if want to use version 2 of the Cyrus SASL library. ])
           need_sasl=yes
         fi
@@ -1164,7 +1132,15 @@ then
   AC_MSG_CHECKING([for w3m])
   AC_PATH_PROG([HTML2TXT_CMD], [w3m], [none])
 fi
+if test x"$HTML2TXT_CMD" = x"none"
+then
+  AC_MSG_CHECKING([for elinks])
+  AC_PATH_PROG([HTML2TXT_CMD], [elinks], [none])
+fi
 case "$HTML2TXT_CMD" in
+  *elinks*)
+    HTML2TXT_CMD="$HTML2TXT_CMD -dump -no-numbering -no-references \$^ > \$@"
+    ;;
   *lynx*)
     HTML2TXT_CMD="$HTML2TXT_CMD -dump -nolist -with_backspaces \$^ > \$@"
     ;;
@@ -1182,7 +1158,7 @@ AC_PATH_PROG([HTMLCLEAN_CMD], [tidy], [none])
 
 if test x"$HTMLCLEAN_CMD" != x"none"
 then
-  HTMLCLEAN_CMD="$HTMLCLEAN_CMD -i -m -asxml -utf8 "
+  HTMLCLEAN_CMD="$HTMLCLEAN_CMD -q -i -m -asxml -utf8 "
 else
   HTMLCLEAN_CMD="echo "
 fi