X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.ac;h=033ef1418b01da8617fb08cd84c2363016a676c1;hp=370486f7b9805999ac0cd4b9bc9060e5c951157b;hb=4167decfe24c5d9f48f3c94276023df114fa47a9;hpb=4670d23c56f21afaa7ef2e0289a47a6a0d112671

diff --git a/configure.ac b/configure.ac
index 370486f..033ef14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ AM_CONFIG_HEADER(config.h)
 
 mutt_cv_version=`cat "$srcdir/VERSION.in"`
 
-AM_INIT_AUTOMAKE(muttng, $mutt_cv_version)
+AM_INIT_AUTOMAKE(madmutt, $mutt_cv_version)
 AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/VERSION.in'])
 
 AC_GNU_SOURCE
@@ -36,6 +36,7 @@ AC_PROG_CPP
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_PROG_RANLIB
+AC_PROG_GPERF
 AC_CHECK_TOOL(AR, ar, ar)
 
 AC_C_INLINE
@@ -397,7 +398,7 @@ fi
 AC_MSG_CHECKING(where to put the documentation)
 AC_ARG_WITH(docdir, AC_HELP_STRING([--with-docdir=PATH], [Specify where to put the documentation]),
         [mutt_cv_docdir=$withval],
-        [mutt_cv_docdir="${prefix}/doc/muttng"])
+        [mutt_cv_docdir="${prefix}/doc/madmutt"])
 AC_MSG_RESULT($mutt_cv_docdir)
 
 docdir=$mutt_cv_docdir
@@ -415,28 +416,6 @@ AC_SUBST(DOTLOCK_PERMISSION)
 
 dnl -- socket dependencies --
 
-AC_ARG_ENABLE(pop,  AC_HELP_STRING([--enable-pop], [Enable POP3 support]),
-[   if test x$enableval = xyes ; then
-        AC_DEFINE(USE_POP,1,[ Define if you want support for the POP3 protocol. ])
-        LIBPOP="-Lpop -lpop"
-        LIBPOPDEPS="\$(top_srcdir)/pop/pop.h pop/libpop.a"
-        need_pop="yes"
-        need_md5="yes"
-    fi
-])
-AM_CONDITIONAL(BUILD_POP, test x$need_pop = xyes)
-
-AC_ARG_ENABLE(imap, AC_HELP_STRING([--enable-imap], [Enable IMAP support]),
-[   if test x$enableval = xyes ; then
-        AC_DEFINE(USE_IMAP,1,[ Define if you want support for the IMAP protocol. ])
-        LIBIMAP="-Limap -limap"
-        LIBIMAPDEPS="\$(top_srcdir)/imap/imap.h imap/libimap.a"
-        need_imap="yes"
-        need_md5="yes"
-    fi
-])
-AM_CONDITIONAL(BUILD_IMAP, test x$need_imap = xyes)
-
 AC_ARG_ENABLE(nntp, [  --enable-nntp              Enable NNTP support],
 [   if test x$enableval = xyes ; then
         AC_DEFINE(USE_NNTP,1,[ Compiling with newsreading support with NNTP ])
@@ -463,8 +442,6 @@ AC_ARG_WITH(gss, AC_HELP_STRING([--with-gss[=PFX]], [Compile in GSSAPI authentic
     gss_prefix="$withval", gss_prefix="no")
 if test "$gss_prefix" != "no"
 then
-  if test "$need_imap" = "yes"
-  then
     MUTT_AM_PATH_GSSAPI(gss_prefix)
     AC_MSG_CHECKING(GSSAPI implementation)
     AC_MSG_RESULT($GSSAPI_IMPL)
@@ -481,9 +458,6 @@ then
     MUTTLIBS="$MUTTLIBS $GSSAPI_LIBS"
     AC_DEFINE(USE_GSS,1,[ Define if you have GSSAPI libraries available ])
     need_gss="yes"
-  else
-    AC_MSG_WARN([GSS was requested but IMAP is not enabled])
-  fi
 fi
 AM_CONDITIONAL(USE_GSS, test x$need_gss = xyes)
 
@@ -536,13 +510,9 @@ fi
 
 AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes)
 
-AC_ARG_WITH(sasl2, AC_HELP_STRING([--with-sasl2[=PFX]], [Use Cyrus SASL library version 2 for POP/IMAP authentication]),
+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"
-        then
-          AC_MSG_ERROR([SASL2 support is only useful with POP or IMAP support])
-        fi
-
         if test "$with_sasl2" != "no"
         then
           if test "$with_sasl2" != "yes"
@@ -744,10 +714,6 @@ dnl -- end cache --
 
 AC_SUBST(MUTTLIBS)
 AC_SUBST(MUTT_LIB_OBJECTS)
-AC_SUBST(LIBIMAP)
-AC_SUBST(LIBIMAPDEPS)
-AC_SUBST(LIBPOP)
-AC_SUBST(LIBPOPDEPS)
 AC_SUBST(LIBNNTP)
 AC_SUBST(LIBNNTPDEPS)
 
@@ -1034,10 +1000,11 @@ AC_OUTPUT(Makefile intl/Makefile m4/Makefile
         muttbug.sh
         lib-lib/Makefile
         lib-mime/Makefile
+        lib-crypt/Makefile
         lib-hash/Makefile
         lib/Makefile
         imap/Makefile
         pop/Makefile
         nntp/Makefile
-        Muttngrc.head
+        Madmuttrc.head
         doc/instdoc.sh)