X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.in;h=39bb7ea59f8e09cc530c24792714b248fafd0f86;hp=66d54de12812027179c33d9669de172b75ad5019;hb=faed98ab64dd3cbd29e674141cd074d6c9f8909c;hpb=6833ce8bdca2d64e14485118f2a4417b7e1cb1b1

diff --git a/configure.in b/configure.in
index 66d54de..39bb7ea 100644
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,7 @@ AM_CONFIG_HEADER(config.h)
 mutt_cv_version=`cat $srcdir/VERSION`
 
 
-AM_INIT_AUTOMAKE(mutt, $mutt_cv_version)
+AM_INIT_AUTOMAKE(muttng, $mutt_cv_version)
 
 ifdef([AC_LIBOBJ], , [define([AC_LIBOBJ], [LIB[]OBJS="$LIBOBJS $1.o"])])
 
@@ -264,7 +264,7 @@ AC_CHECK_HEADERS(stdarg.h sys/ioctl.h ioctl.h sysexits.h)
 AC_CHECK_HEADERS(sys/time.h sys/resource.h)
 AC_CHECK_HEADERS(unix.h)
 
-AC_CHECK_FUNCS(setrlimit getsid)
+AC_CHECK_FUNCS(setrlimit getsid isctype)
 
 AC_TYPE_SIGNAL
 
@@ -596,6 +596,34 @@ AC_ARG_WITH(ssl, [  --with-ssl[=PFX]           Compile in SSL support for POP/IM
 ])
 AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes)
 
+AC_ARG_WITH(gnutls, [  --with-gnutls[=PFX]        Compile in GNU TLS support for POP/IMAP],
+[   if test "$need_ssl" = "yes"
+    then
+      AC_MSG_ERROR([In order to compile in GNU TLS support, you must first disable SSL support])
+    fi
+    if test "$with_gnutls" != "no"
+    then
+      if test "$need_socket" != "yes"; then
+        AC_MSG_ERROR([GNU TLS support is only useful with POP or IMAP support])
+      fi
+      if test "$with_gnutls" != "yes"
+      then
+        LDFLAGS="$LDFLAGS -L$withval/lib"
+        CPPFLAGS="$CPPFLAGS -I$withval/include"
+      fi
+#saved_LIBS="$LIBS"
+
+      AC_CHECK_LIB([gnutls], [gnutls_init],, AC_MSG_ERROR(Unable to find GNU TLS library))
+
+      AC_DEFINE(USE_GNUTLS,1,[ Define if you want support for GNU TLS. ])
+#LIBS="$saved_LIBS"
+#MUTTLIBS="$MUTTLIBS -lgnutls"
+      MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_ssl_gnutls.o"
+      need_gnutls=yes
+    fi
+])
+AM_CONDITIONAL(USE_GNUTLS, test x$need_gnutls = xyes)
+
 dnl SSL support via NSS
 AC_ARG_WITH(nss, [  --with-nss[=PFX]           Compile in SSL support for POP/IMAP via NSS],
 [       if test "$with_nss" != no
@@ -754,6 +782,11 @@ AC_ARG_ENABLE(mailtool, [  --enable-mailtool          Enable Sun mailtool attach
                 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)
+        fi])
+
 AC_ARG_ENABLE(locales-fix, [  --enable-locales-fix       The result of isprint() is unreliable ],
         [if test x$enableval = xyes; then
                 AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])