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
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]),
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
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
AC_ARG_WITH(gdbm, AC_HELP_STRING([--without-gdbm], [Don't use gdbm even if it is available]),
ac_prefer_gdbm=$withval)
if test x$ac_prefer_gdbm != xno; then
- CPPFLAGS="$OLDCPPFLAGS"
- LIBS="$OLDLIBS -lgdbm";
- AC_CACHE_CHECK(for gdbm_open, ac_cv_gdbmopen,[
- ac_cv_gdbmopen=no
+ ac_cv_gdbmopen=no
+ GDBM_DIRS="$mutt_cv_prefix /usr/local /usr"
+ AC_MSG_CHECKING([for gdbm_open])
+ for d in $GDBM_DIRS; do
+ if test x$ac_cv_gdbmopen = xno && test -d "$d/include" && test -d "$d/lib"; then
+ GDBM_INC="-I$d/include"
+ GDBM_LIB="-L$d/lib"
+ CPPFLAGS="$OLDCPPFLAGS $GDBM_INC"
+ LIBS="$OLDLIBS $GDBM_LIB -lgdbm"
AC_TRY_LINK([#include <gdbm.h>],[gdbm_open(0,0,0,0,0);],[ac_cv_gdbmopen=yes])
- ])
+ fi
+ done
fi
ac_bdb_prefix=yes
fi
if test x$ac_cv_gdbmopen = xyes; then
- CPPFLAGS="$OLDCPPFLAGS"
- LIBS="$OLDLIBS -lgdbm";
+ CPPFLAGS="$OLDCPPFLAGS $GDBM_INC"
+ LIBS="$OLDLIBS $GDBM_LIB -lgdbm";
AC_DEFINE(HAVE_GDBM, 1, [GDBM Support])
elif test x$ac_cv_dbcreate = xyes; then
CPPFLAGS="-I$BDB_INCLUDE_DIR $OLDCPPFLAGS"