# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP U ANSI2KNR RANLIB ac_ct_RANLIB AR ac_ct_AR DBX GDB SDB DEBUGGER SENDMAIL GPGME_CONFIG LIBGPGME_CFLAGS LIBGPGME_LIBS OPS PGPAUX_TARGET SMIMEAUX_TARGET SUBVERSION ISPELL LIBOBJS DOTLOCK_TARGET docdir DOTLOCK_GROUP DOTLOCK_PERMISSION BUILD_IMAP_TRUE BUILD_IMAP_FALSE KRB5CFGPATH USE_GSS_TRUE USE_GSS_FALSE USE_SSL_TRUE USE_SSL_FALSE USE_GNUTLS_TRUE USE_GNUTLS_FALSE LIBGNUTLS_CONFIG LIBGNUTLS_CFLAGS LIBGNUTLS_LIBS USE_SASL_TRUE USE_SASL_FALSE MUTTLIBS MUTT_LIB_OBJECTS LIBIMAP LIBIMAPDEPS ALLOCA GLIBC21 LIBICONV USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT MKINSTALLDIRS INTL_LIBTOOL_SUFFIX_PREFIX mutt_libesmtp_config_path LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP U ANSI2KNR RANLIB ac_ct_RANLIB AR ac_ct_AR DBX GDB SDB DEBUGGER SENDMAIL GPGME_CONFIG LIBGPGME_CFLAGS LIBGPGME_LIBS OPS PGPAUX_TARGET SMIMEAUX_TARGET SUBVERSION ISPELL LIBOBJS DOTLOCK_TARGET docdir DOTLOCK_GROUP DOTLOCK_PERMISSION BUILD_IMAP_TRUE BUILD_IMAP_FALSE KRB5CFGPATH USE_GSS_TRUE USE_GSS_FALSE USE_SSL_TRUE USE_SSL_FALSE LIBGNUTLS_CONFIG LIBGNUTLS_CFLAGS LIBGNUTLS_LIBS USE_SASL_TRUE USE_SASL_FALSE MUTTLIBS MUTT_LIB_OBJECTS LIBIMAP LIBIMAPDEPS ALLOCA GLIBC21 LIBICONV USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT MKINSTALLDIRS INTL_LIBTOOL_SUFFIX_PREFIX mutt_libesmtp_config_path LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
--with-domain=DOMAIN Specify your DNS domain name
--with-gss=PFX Compile in GSSAPI authentication for IMAP
--with-ssl=PFX Compile in SSL support for POP/IMAP
- --with-gnutls=PFX Compile in GNU TLS support for POP/IMAP
--with-nss=PFX Compile in SSL support for POP/IMAP via NSS
--with-gnutls=PFX Enable SSL support using gnutls
--with-sasl=PFX Use Cyrus SASL library for POP/IMAP authentication
#define CRYPT_BACKEND_CLASSIC_PGP 1
_ACEOF
- 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
_ACEOF
MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS smime.o crypt-mod-smime-classic.o"
- SMIMEAUX_TARGET="smime_keys"
+ SMIMEAUX_TARGET="smime_keysng"
fi
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
else
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
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
-# Check whether --with-gnutls or --without-gnutls was given.
-if test "${with_gnutls+set}" = set; then
- withval="$with_gnutls"
- if test "$need_ssl" = "yes"
- then
- { { echo "$as_me:$LINENO: error: In order to compile in GNU TLS support, you must first disable SSL support" >&5
-echo "$as_me: error: In order to compile in GNU TLS support, you must first disable SSL support" >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test "$with_gnutls" != "no"
- then
- if test "$need_socket" != "yes"; then
- { { echo "$as_me:$LINENO: error: GNU TLS support is only useful with POP or IMAP support" >&5
-echo "$as_me: error: GNU TLS support is only useful with POP or IMAP support" >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test "$with_gnutls" != "yes"
- then
- LDFLAGS="$LDFLAGS -L$withval/lib"
- CPPFLAGS="$CPPFLAGS -I$withval/include"
- fi
-#saved_LIBS="$LIBS"
-
-
-echo "$as_me:$LINENO: checking for gnutls_init in -lgnutls" >&5
-echo $ECHO_N "checking for gnutls_init in -lgnutls... $ECHO_C" >&6
-if test "${ac_cv_lib_gnutls_gnutls_init+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgnutls $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char gnutls_init ();
-int
-main ()
-{
-gnutls_init ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_gnutls_gnutls_init=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gnutls_gnutls_init=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gnutls_gnutls_init" >&5
-echo "${ECHO_T}$ac_cv_lib_gnutls_gnutls_init" >&6
-if test $ac_cv_lib_gnutls_gnutls_init = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBGNUTLS 1
-_ACEOF
-
- LIBS="-lgnutls $LIBS"
-
-else
- { { echo "$as_me:$LINENO: error: Unable to find GNU TLS library" >&5
-echo "$as_me: error: Unable to find GNU TLS library" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_GNUTLS 1
-_ACEOF
-
-#LIBS="$saved_LIBS"
-#MUTTLIBS="$MUTTLIBS -lgnutls"
- MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_ssl_gnutls.o"
- need_gnutls=yes
- fi
-
-fi;
-
-
-if test x$need_gnutls = xyes; then
- USE_GNUTLS_TRUE=
- USE_GNUTLS_FALSE='#'
-else
- USE_GNUTLS_TRUE='#'
- USE_GNUTLS_FALSE=
-fi
-
-
-
# Check whether --with-nss or --without-nss was given.
if test "${with_nss+set}" = set; then
withval="$with_nss"
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${USE_GNUTLS_TRUE}" && test -z "${USE_GNUTLS_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"USE_GNUTLS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_GNUTLS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
if test -z "${USE_SASL_TRUE}" && test -z "${USE_SASL_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"USE_SASL\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
s,@USE_GSS_FALSE@,$USE_GSS_FALSE,;t t
s,@USE_SSL_TRUE@,$USE_SSL_TRUE,;t t
s,@USE_SSL_FALSE@,$USE_SSL_FALSE,;t t
-s,@USE_GNUTLS_TRUE@,$USE_GNUTLS_TRUE,;t t
-s,@USE_GNUTLS_FALSE@,$USE_GNUTLS_FALSE,;t t
s,@LIBGNUTLS_CONFIG@,$LIBGNUTLS_CONFIG,;t t
s,@LIBGNUTLS_CFLAGS@,$LIBGNUTLS_CFLAGS,;t t
s,@LIBGNUTLS_LIBS@,$LIBGNUTLS_LIBS,;t t
projects / apps / madmutt.git / blobdiff