2009-07-14 [colin] 3.7.2cvs8

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index fb7f1849e01792d8387736c8f6f96b129a05a56f..a5c9b6e4695190d3e172fb06251f55c8c3ee34fe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,16 +2,17 @@
 AC_PREREQ(2.60)
 AC_INIT(src/main.c)
 AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_MACRO_DIR([m4])
 
 PACKAGE=claws-mail
 
 dnl version number
 MAJOR_VERSION=3
 MINOR_VERSION=7
-MICRO_VERSION=1
+MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=25
+EXTRA_VERSION=8
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -86,16 +87,12 @@ AM_PROG_LEX
 AC_PROG_YACC
 AC_LIB_PREFIX
 AC_LIBTOOL_WIN32_DLL
-<<<<<<< configure.ac
-dnl LT_AC_PROG_RC
-=======
 LT_AC_PROG_RC
->>>>>>> 1.654.2.3832
 AC_LIBTOOL_RC
 AC_PROG_LIBTOOL
 
-CLAWS_ACLOCAL_INCLUDE(m4)
-  
+AC_SYS_LARGEFILE
+
 dnl ******************************
 dnl Checks for host
 dnl Not needed anymore because we 
@@ -193,7 +190,7 @@ AC_CHECK_FUNCS(bind_textdomain_codeset)
 LIBS=$syl_save_LIBS
 
 dnl for gettext
-ALL_LINGUAS="bg ca cs de en_GB es fi fr hu it ja nl pl pt_BR ru sv zh_CN"
+ALL_LINGUAS="bg ca cs de en_GB es fi fr hu id it ja nl pl pt_BR pt_PT ru sk sv zh_CN"
 GETTEXT_PACKAGE=claws-mail
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define text domain.])
@@ -400,10 +397,10 @@ 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_cv_enable_gnutls=no])
-  ],[ac_cv_enable_gnutls=no])
+  PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.0.3,
+       [ac_cv_enable_gnutls=yes],
+       [ac_cv_enable_gnutls=no
+        echo "GnuTLS version >= 2.0.3 not found"])
   if test "x$ac_cv_enable_gnutls" = "xyes"; then
    AC_CHECK_HEADER(gpg-error.h,
        [AC_CHECK_LIB(gpg-error, gpg_strerror,,
@@ -489,6 +486,7 @@ if test $ac_cv_enable_enchant = yes; then
                AC_DEFINE(USE_ENCHANT, 1, enchant)
                echo "Building with enchant"
                ac_cv_enable_enchant=yes
+               CFLAGS="$CFLAGS `$PKG_CONFIG --cflags enchant`"
        ],
        [
                echo "Building without enchant-notification"