dnl version number
MAJOR_VERSION=3
MINOR_VERSION=6
-MICRO_VERSION=0
+MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=19
+EXTRA_VERSION=76
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
AC_MSG_RESULT(no)
fi
-dnl Check for OpenSSL
-AC_ARG_ENABLE(openssl,
- [ --disable-openssl disable OpenSSL support.],
- [ac_cv_enable_openssl=$enableval], [ac_cv_enable_openssl=yes])
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_cv_enable_gnutls=$enableval], [ac_cv_enable_gnutls=no])
-if test x$ac_cv_enable_openssl = xyes && test x$ac_cv_enable_gnutls != xyes; then
- ac_cv_enable_gnutls="no"
-fi
-if test x$ac_cv_enable_gnutls = xyes; then
- ac_cv_enable_openssl="no"
-fi
+ [ac_cv_enable_gnutls=$enableval], [ac_cv_enable_gnutls=yes])
-AC_MSG_CHECKING([whether to use OpenSSL])
-if test x"$ac_cv_enable_openssl" = xyes; then
- AC_MSG_RESULT(yes)
- PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.7, :, ac_cv_enable_openssl=no)
- if test x$ac_cv_enable_openssl = xyes; then
- AC_DEFINE(USE_OPENSSL, 1, Define if you want OpenSSL support)
- else
- AC_MSG_RESULT(not found)
- AC_MSG_WARN([*** OpenSSL will not be supported ***])
+if test "x$ac_cv_enable_gnutls" != "xyes"; then
+ if test "x$ac_cv_enable_openssl" = "xyes"; then
+ AC_MSG_ERROR(*** Use GnuTLS instead of OpenSSL due to licensing ***)
fi
-else
- AC_MSG_RESULT(no)
fi
-AC_SUBST(OPENSSL_CFLAGS)
-AC_SUBST(OPENSSL_LIBS)
-
-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,
[
dnl Printing support.
PKG_CHECK_MODULES(GTK210, gtk+-2.0 >= 2.10, ac_cv_have_gtk210=yes, ac_cv_have_gtk210=no)
+AC_MSG_CHECKING([whether to use libgnomeprint])
+AC_ARG_ENABLE(gnomeprint,
+ [ --disable-gnomeprint disable libgnomeprint support],
+ [ac_cv_enable_gnomeprint=$enableval], [ac_cv_enable_gnomeprint=auto])
+
+if test x$ac_cv_have_gtk210 = xyes; then
+ ac_cv_enable_gnomeprint="no"
+fi
+
+if test x$ac_cv_enable_gnomeprint = xyes \
+ -o \( x$ac_cv_enable_gnomeprint = xauto \
+ -a x$ac_cv_have_gtk210 = xno \); then
+ AC_MSG_RESULT(yes)
+ PKG_CHECK_MODULES(GNOMEPRINT, libgnomeprint-2.2 libgnomeprintui-2.2,
+ ac_cv_enable_gnomeprint=yes, ac_cv_enable_gnomeprint=no)
+ if test x"$ac_cv_enable_gnomeprint" = xyes; then
+ AC_DEFINE(USE_GNOMEPRINT, 1, Define if you want libgnomeprint support)
+ else
+ AC_MSG_RESULT(not found)
+ AC_MSG_WARN([*** libgnomeprintui wasn't found ***])
+ AC_MSG_WARN([*** using built-in printing support ***])
+ fi
+else
+ ac_cv_enable_gnomeprint=no
+ AC_MSG_RESULT(no)
+fi
+AM_CONDITIONAL(CLAWS_GNOMEPRINT, test x"$ac_cv_enable_gnomeprint" = x"yes")
+
AC_MSG_CHECKING([whether to use valgrind])
AC_ARG_ENABLE(valgrind,
[ --disable-valgrind disable valgrind support for debugging],
echo ""
echo "JPilot : $ac_cv_enable_jpilot"
echo "LDAP : $ac_cv_enable_ldap"
-echo "OpenSSL : $ac_cv_enable_openssl"
echo "gnuTLS : $ac_cv_enable_gnutls"
echo "iconv : $am_cv_func_iconv"
echo "compface : $ac_cv_enable_compface"
echo "IMAP4 : $ac_cv_enable_libetpan"
echo "NNTP : $ac_cv_enable_libetpan"
echo "Crash dialog : $ac_cv_enable_crash_dialog"
+echo "Libgnomeprint : $ac_cv_enable_gnomeprint"
echo "GTK+ print support: $ac_cv_have_gtk210"
echo "LibSM : $ac_cv_enable_libsm"
echo "DBUS : $enable_dbus"
projects / claws.git / blobdiff