dnl version number
MAJOR_VERSION=3
-MINOR_VERSION=6
-MICRO_VERSION=1
+MINOR_VERSION=7
+MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=41
+EXTRA_VERSION=10
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
CFLAGS="$CFLAGS -Wno-unused-function"
fi
+AC_MSG_CHECKING([if gcc supports -Wno-pointer-sign])
+_gcc_cflags_save=$CFLAGS
+CFLAGS="-Wno-pointer-sign"
+AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]),_gcc_psign=yes,_gcc_psign=no)
+AC_MSG_RESULT($_gcc_psign)
+CFLAGS=$_gcc_cflags_save;
+if test x"$_gcc_psign" = xyes ; then
+ CFLAGS="$CFLAGS -Wno-pointer-sign"
+fi
+
CFLAGS="$CFLAGS -Wall"
if test $USE_MAINTAINER_MODE = yes; then
LIBS=$syl_save_LIBS
dnl for gettext
-ALL_LINGUAS="bg ca de en_GB es fi fr hu it nl pl pt_BR ru sk sr sv zh_CN"
+ALL_LINGUAS="bg ca cs de en_GB es fi fr hu it nl pl pt_BR ru sv zh_CN"
GETTEXT_PACKAGE=claws-mail
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define text domain.])
fi
dnl GNUTLS
+AC_MSG_CHECKING([whether to use GnuTLS])
AC_ARG_ENABLE(openssl, [ --enable-openssl enable GnuTLS support],
[ac_cv_enable_openssl=$enableval], [ac_cv_enable_openssl=no])
AC_ARG_ENABLE(gnutls, [ --enable-gnutls enable GnuTLS support],
AC_MSG_ERROR(*** Use GnuTLS instead of OpenSSL due to licensing ***)
fi
fi
-AC_MSG_CHECKING([whether to use GnuTLS])
+AC_MSG_RESULT($ac_cv_enable_gnutls)
if test "x$ac_cv_enable_gnutls" != "xno"; then
OCPPFLAGS="$CPPFLAGS"
OLDFLAGS="$LDFLAGS"
GNUTLS_LIBS=""
AC_CHECK_HEADER(gnutls/gnutls.h, [
- AC_CHECK_LIB(gnutls, gnutls_global_deinit,
- [AC_DEFINE(USE_GNUTLS, 1, Define to use GnuTLS.)],
+ AC_CHECK_LIB(gnutls, gnutls_global_deinit,,
[ac_cv_enable_gnutls=no])
],[ac_cv_enable_gnutls=no])
- if test "x$ac_cv_enable_gnutls" != "xyes"; then
+ if test "x$ac_cv_enable_gnutls" = "xyes"; then
+ AC_CHECK_HEADER(gpg-error.h,
+ [AC_CHECK_LIB(gpg-error, gpg_strerror,,
+ [ac_cv_enable_gnutls=no])
+ ],[ac_cv_enable_gnutls=no])
+ fi
+ if test "x$ac_cv_enable_gnutls" = "xyes"; then
+ GCRYPT_LIBS="-lgpg-error"
+ AC_CHECK_HEADER(gcrypt.h,
+ [AC_CHECK_LIB(gcrypt, gcry_control,,
+ [ac_cv_enable_gnutls=no])
+ ],[ac_cv_enable_gnutls=no])
+ fi
+ if test "x$ac_cv_enable_gnutls" = "xyes"; then
+ if test x"$platform_win32" = "xyes"; then
+ GNUTLS_LIBS="-lgnutls -lgcrypt ${GCRYPT_LIBS}"
+ else
+ GNUTLS_LIBS="-lgnutls -lgcrypt -lz ${GCRYPT_LIBS}"
+ fi
+ fi
+else
CPPFLAGS="$OCPPFLAGS"
LDFLAGS="$OLDFLAGS"
- fi
fi
+
if test "x$ac_cv_enable_gnutls" = "xyes"; then
AC_DEFINE([USE_GNUTLS],1, [Define to use GnuTLS])
- GNUTLS_LIBS="-lgnutls"
else
GNUTLS_LIBS=""
fi
AC_SUBST(GTK_LIBS)
dnl enchant is used for spell checking
+AC_MSG_CHECKING([whether to use enchant])
AC_ARG_ENABLE(enchant,
[ --disable-enchant disable enchant support],
[ac_cv_enable_enchant=$enableval], [ac_cv_enable_enchant=yes])
-AC_MSG_CHECKING([whether to use enchant])
+AC_MSG_RESULT($ac_cv_enable_enchant)
if test $ac_cv_enable_enchant = yes; then
PKG_CHECK_MODULES(ENCHANT, enchant >= 1.0.0,
[