X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.in;h=3f9cba1f19da92a2a8df456d57b1629c5343a680;hp=9030c9260de30e9e9d30e7357c1da48c186808cc;hb=f2c6ea5470ab89bf4fd14958cc1090bedbb5b2e8;hpb=a079d019ec8e6f0be0decaafc9e914bc842f9983

diff --git a/configure.in b/configure.in
index 9030c92..3f9cba1 100644
--- a/configure.in
+++ b/configure.in
@@ -131,7 +131,7 @@ else
         if test x$have_pgp != xno ; then
                 AC_DEFINE(CRYPT_BACKEND_CLASSIC_PGP,1,
                     [ Define if you want classic PGP support. ])
-                PGPAUX_TARGET="pgpring pgpewrap"
+                PGPAUX_TARGET="pgpringng pgpewrapng"
                 MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o crypt-mod-pgp-classic.o"
         fi
 
@@ -145,7 +145,7 @@ else
  		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_keys"
+		SMIMEAUX_TARGET="smime_keysng"
  	fi
   
         AC_ARG_WITH(mixmaster, AC_HELP_STRING([--with-mixmaster[=PATH]], [Include Mixmaster support]),
@@ -197,13 +197,13 @@ main ()
         if test $withval = yes; then
                 if test -d $srcdir/../slang; then
                         mutt_cv_slang=$srcdir/../slang/src
-                        CPPFLAGS="$CPPFLAGS -I${mutt_cv_slang}"
+                        CFLAGS="$CFLAGS -I${mutt_cv_slang}"
                         LDFLAGS="$LDFLAGS -L${mutt_cv_slang}/objs"
                 else
                         if test -d $mutt_cv_prefix/include/slang; then
-                                CPPFLAGS="$CPPFLAGS -I$mutt_cv_prefix/include/slang"
+                                CFLAGS="$CFLAGS -I$mutt_cv_prefix/include/slang"
                         elif test -d /usr/include/slang; then
-                                CPPFLAGS="$CPPFLAGS -I/usr/include/slang"
+                                CFLAGS="$CFLAGS -I/usr/include/slang"
                         fi
                         mutt_cv_slang=yes
                 fi
@@ -211,15 +211,15 @@ main ()
                 dnl ---Check to see if $withval is a source directory
                 if test -f $withval/src/slang.h; then
                         mutt_cv_slang=$withval/src
-                        CPPFLAGS="$CPPFLAGS -I${mutt_cv_slang}"
+                        CFLAGS="$CFLAGS -I${mutt_cv_slang}"
                         LDFLAGS="$LDFLAGS -L${mutt_cv_slang}/objs"
                 else
                         dnl ---Must be installed somewhere
                         mutt_cv_slang=$withval
                         if test -d $withval/include/slang; then
-                                CPPFLAGS="$CPPFLAGS -I${withval}/include/slang"
+                                CFLAGS="$CFLAGS -I${withval}/include/slang"
                         elif test -d $withval/include; then
-                                CPPFLAGS="$CPPFLAGS -I${withval}/include"
+                                CFLAGS="$CFLAGS -I${withval}/include"
                         fi
                         LDFLAGS="$LDFLAGS -L${withval}/lib"
                 fi
@@ -599,34 +599,6 @@ AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl[=PFX]], [Compile in SSL support for
 ])
 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, AC_HELP_STRING([--with-nss[=PFX]], [Compile in SSL support for POP/IMAP via NSS]),
 [       if test "$with_nss" != no