AC_MSG_ERROR([*** pkg-config not found. See http://www.freedesktop.org/software/pkgconfig/])
fi
-dnl GNOME 2.x installed?
-PKG_CHECK_MODULES(GNOME2, libgnome-2.0 >= 2.0, ac_enable_gnome2=yes, ac_enable_gnome2=no)
-AM_CONDITIONAL(CLAWS_GNOME2, test x"$ac_enable_gnome2" = x"yes")
-
dnl libtool versioning
LT_RELEASE=$MAJOR_VERSION.$MINOR_VERSION
LT_CURRENT=`expr $MICRO_VERSION - $INTERFACE_AGE`
LT_AC_PROG_RC
AC_LIBTOOL_RC
AC_PROG_LIBTOOL
+AC_PROG_AWK
AC_SYS_LARGEFILE
LIBS=$syl_save_LIBS
dnl for gettext
-ALL_LINGUAS="bg ca cs de en_GB eo es fi fr he hu it lt nb nl pt_BR sk sv zh_TW"
+ALL_LINGUAS="ca cs de en_GB es fi fr he hu it lt nb nl pt_BR ru sk sv zh_TW"
GETTEXT_PACKAGE=claws-mail
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define text domain.])
[ --disable-valgrind Do not build valgrind support for debugging],
[enable_valgrind=$enableval], [enable_valgrind=yes])
-AC_ARG_ENABLE(new-addrbook,
- [ --enable-new-addrbook Build new external address book support],
- [enable_new_addrbook=$enableval], [enable_new_addrbook=no])
+AC_ARG_ENABLE(alternate-addressbook,
+ [ --enable-alternate-addressbook Build alternate external address book support],
+ [enable_alternate_addressbook=$enableval], [enable_alternate_addressbook=no])
AC_ARG_ENABLE(gtk3,
[ --enable-gtk3 Build GTK3 support],
AC_CHECK_HEADER([execinfo.h], [AC_DEFINE(HAVE_BACKTRACE,1,[Has backtrace*() needed for retrieving stack traces])])
AC_SEARCH_LIBS(backtrace_symbols, [execinfo])
-dnl alf - Check for apache installation f*ck up. apache may also install an
-dnl fnmatch, which includes their own regex stuff if USE_HSREGEX is defined
-AC_TRY_COMPILE([#include <stdlib.h>
- #include <fnmatch.h>],
- [int x = USE_HSREGEX;],
- ac_cv_have_apache_fnmatch=yes, ac_cv_have_apache_fnmatch=no)
-if test $ac_cv_have_apache_fnmatch = yes; then
- AC_DEFINE(HAVE_APACHE_FNMATCH, 1, Define if you need to work around apache regex/fnmatch !KLUDGE!)
-fi
-AC_MSG_CHECKING([whether to use Apache regex header kludge])
-AC_MSG_RESULT($ac_cv_have_apache_fnmatch)
-
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_TYPE_OFF_T
dnl RC dir (will be default at a certain point in time)
AC_ARG_WITH(config-dir, [ --with-config-dir=RCDIR Local configuration dir (default: .claws-mail)],
- ac_cv_with_config_dir="$withval", ac_cv_with_config_dir=".claws-mail")
+ ac_cv_with_config_dir="$withval", ac_cv_with_config_dir="")
+
+dnl Set correct default value based on platform
if test x"$ac_cv_with_config_dir" = x""; then
- ac_cv_with_config_dir=".claws-mail"
+ if test x"$platform_win32" = xyes; then
+ ac_cv_with_config_dir="Claws-mail"
+ else
+ ac_cv_with_config_dir=".claws-mail"
+ fi
fi
AC_DEFINE_UNQUOTED(CFG_RC_DIR, "$ac_cv_with_config_dir", Configuration directory)
+AC_ARG_WITH(password-encryption, [ --with-password-encryption=PROVIDER Which cryptographic library to use for encrypting stored passwords (gnutls, old, default)],
+ pwd_crypto="$withval", pwd_crypto="default")
+
+if test x"$pwd_crypto" = xdefault; then
+ if test x"$enable_gnutls" = xyes; then
+ if `$PKG_CONFIG --atleast-version=3.0 gnutls`; then
+ pwd_crypto="gnutls"
+ fi
+ fi
+fi
+if test x"$pwd_crypto" = xdefault; then
+ pwd_crypto="old"
+fi
+
+case $pwd_crypto in
+ gnutls)
+ if test x"$enable_gnutls" = xno; then
+ AC_MSG_ERROR([GnuTLS password encryption requested but GnuTLS is not available.])
+ fi
+ if ! `$PKG_CONFIG --atleast-version=3.0 gnutls`; then
+ AC_MSG_ERROR([GnuTLS version at least 3.0 is required for password encryption.])
+ fi
+ AC_DEFINE(PASSWORD_CRYPTO_GNUTLS, 1, Use GnuTLS for stored password encryption)
+ ;;
+ old)
+ AC_DEFINE(PASSWORD_CRYPTO_OLD, 1, Use old insecure method for stored password encryption)
+ ;;
+ *)
+ AC_MSG_ERROR([Unknown password encryption provider requested.])
+ ;;
+esac
+
+
dnl ************************
dnl ** GTK user interface **
dnl ************************
dnl #######################################################################
dnl #######################################################################
-dnl # Check for new address book support
+dnl # Check for alternate address book support
dnl #######################################################################
-AC_MSG_CHECKING([whether DBUS support for new address book is present])
+AC_MSG_CHECKING([whether DBUS support for alternate address book is present])
if test x"$enable_dbus_glib" = xyes; then
AC_MSG_RESULT([yes])
- AC_MSG_CHECKING([whether to enable new address book])
- if test x"$enable_new_addrbook" = xyes; then
+ AC_MSG_CHECKING([whether to enable alternate address book])
+ if test x"$enable_alternate_addressbook" = xyes; then
AC_MSG_RESULT([yes])
PKG_CHECK_MODULES(CONTACTS, [claws-contacts],
[
- AC_DEFINE(USE_NEW_ADDRBOOK, 1, [Define if new address book is to be activated.])
- enable_new_addrbook=yes
+ AC_DEFINE(USE_ALT_ADDRBOOK, 1, [Define if alternate address book is to be activated.])
+ enable_alternate_addressbook=yes
AC_SUBST(CONTACTS_CFLAGS)
AC_SUBST(CONTACTS_LIBS)
],
[
- enable_new_addrbook=no
+ enable_alternate_addressbook=no
])
else
AC_MSG_RESULT([no])
- enable_new_addrbook=no
+ enable_alternate_addressbook=no
fi
else
AC_MSG_RESULT([no])
- enable_new_addrbook=no
+ enable_alternate_addressbook=no
fi
dnl #######################################################################
dnl # Check for old address book support
dnl #######################################################################
-if test x"$enable_new_addrbook" = xno; then
+if test x"$enable_alternate_addressbook" = xno; then
dnl for LDAP support in addressbook
dnl no check for libraries; dynamically loaded
AC_MSG_CHECKING([whether to use LDAP])
fi
fi
-AM_CONDITIONAL(BUILD_NEWADDRBOOK, test x"$enable_new_addrbook" = x"yes")
+AM_CONDITIONAL(BUILD_ALTADDRBOOK, test x"$enable_alternate_addressbook" = x"yes")
dnl #######################################################################
dnl # Check for NetworkManager support
if test "x$libetpan_result" = "xyes"; then
LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
LIBETPAN_LIBS="`$libetpanconfig --libs`"
- LIBETPAN_STABLE=`$libetpanconfig --version | grep -v ^0`
- LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"`
- if test x"$LIBETPAN_STABLE" != "x"; then
- LIBETPAN_VERSION="100"
- fi
- if test "$LIBETPAN_VERSION" -lt "057"; then
+ LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'`
+ if test "$LIBETPAN_VERSION" -lt "57"; then
AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/])
AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
AC_MSG_ERROR([libetpan 0.57 not found])
[enable_mailmbox_plugin=$enableval], [enable_mailmbox_plugin=auto])
AC_ARG_ENABLE(managesieve-plugin,
- [ --disable-managesieve-plugin Do not build managesieve plugin],
+ [ --disable-managesieve-plugin Do not build managesieve plugin],
[enable_managesieve_plugin=$enableval], [enable_managesieve_plugin=auto])
AC_ARG_ENABLE(newmail-plugin,
if test x"$platform_win32" = xno; then
# libpython.so
PYTHON_SHARED_LIB="libpython${PYTHON_VERSION}.so"
- LIBS="-ldl"
+ AC_CHECK_LIB(dl, dlopen, [LIBS="-ldl"])
AC_MSG_CHECKING([whether to dlopen $PYTHON_SHARED_LIB works])
AC_RUN_IFELSE(
[AC_LANG_PROGRAM(
manual/fr/dist/ps/Makefile
manual/fr/dist/html/Makefile
manual/fr/dist/txt/Makefile
-manual/pl/Makefile
-manual/pl/dist/Makefile
-manual/pl/dist/pdf/Makefile
-manual/pl/dist/ps/Makefile
-manual/pl/dist/html/Makefile
-manual/pl/dist/txt/Makefile
manual/es/Makefile
manual/es/dist/Makefile
manual/es/dist/pdf/Makefile
manual/es/dist/ps/Makefile
manual/es/dist/html/Makefile
manual/es/dist/txt/Makefile
-manual/de/Makefile
-manual/de/dist/Makefile
-manual/de/dist/pdf/Makefile
-manual/de/dist/ps/Makefile
-manual/de/dist/html/Makefile
-manual/de/dist/txt/Makefile
claws-mail.pc
])
echo ""
echo "$PACKAGE $VERSION"
echo ""
-if test x"$enable_new_addrbook" = xyes; then
- echo "Using Address Book : New experimental interface"
+if test x"$enable_alternate_addressbook" = xyes; then
+ echo "Using Address Book : Alternate experimental interface"
else
- echo "Using Address Book : Old stable interface"
+ echo "Using Address Book : Original stable interface"
echo "JPilot : $enable_jpilot"
echo "LDAP : $enable_ldap"
fi
echo "Manual : $enable_manual"
echo "Generic UMPC code : $enable_generic_umpc"
echo "Config dir : $ac_cv_with_config_dir"
+echo "Password crypto : $pwd_crypto"
echo "Plugins"
echo " Built:"
projects / claws.git / blobdiff