fix file encoding issues

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index fb7f1849e01792d8387736c8f6f96b129a05a56f..b5e9262d5817b1fa0eab1594902c02b6eb1278a5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,7 @@
 AC_PREREQ(2.60)
 AC_INIT(src/main.c)
 AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_MACRO_DIR([m4])
 
 PACKAGE=claws-mail
 
@@ -11,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=25
+EXTRA_VERSION=85
 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.])
@@ -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"