2005-10-04 [colin] 1.9.15cvs9

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 59201f5c8d762092d9393efd5af4618e9f0020e3..65f49d890d482a5812170dbf0505e9a37d197dce 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,10 +8,10 @@ PACKAGE=sylpheed-claws
 dnl version number
 MAJOR_VERSION=1
 MINOR_VERSION=9
-MICRO_VERSION=14
+MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=2
+EXTRA_VERSION=9
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -146,7 +146,7 @@ AC_CHECK_FUNCS(bind_textdomain_codeset)
 LIBS=$syl_save_LIBS
 
 dnl for gettext
-ALL_LINGUAS="bg ca cs de el en_GB es fi fr hr hu it ja ko nb nl pl pt_BR ru sk sr sv zh_CN zh_TW.Big5"
+ALL_LINGUAS="bg ca cs de el en_GB es fi fr hr hu it ja ko nb nl pl pt_BR ru sk sr sv zh_CN zh_TW"
 GETTEXT_PACKAGE=sylpheed-claws
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define text domain.])
@@ -367,8 +367,8 @@ AC_SUBST(GTK_LIBS)
 
 dnl GNU/Aspell is used for spell checking
 AC_ARG_ENABLE(aspell,
-       [  --enable-aspell         Enable GNU/aspell support [default=no]],
-       [ac_cv_enable_aspell=$enableval], [ac_cv_enable_aspell=no])
+       [  --disable-aspell         Disable GNU/aspell support [default=yes]],
+       [ac_cv_enable_aspell=$enableval], [ac_cv_enable_aspell=yes])
 AC_MSG_CHECKING([whether to use GNU/aspell])
 if test $ac_cv_enable_aspell = yes; then
        AC_MSG_RESULT(yes)
@@ -459,8 +459,8 @@ LIBS="$LIBS $LIBRESOLV"
 dnl for LDAP support in addressbook
 dnl no check for libraries; dynamically loaded
 AC_ARG_ENABLE(ldap,
-       [  --enable-ldap           Enable LDAP support [default=no]],
-       [ac_cv_enable_ldap=$enableval], [ac_cv_enable_ldap=no])
+       [  --disable-ldap         Do not build LDAP support [default=yes]],
+       [ac_cv_enable_ldap=$enableval], [ac_cv_enable_ldap=yes])
 AC_MSG_CHECKING([whether to use LDAP])
 if test x"$ac_cv_enable_ldap" = xno; then
        AC_MSG_RESULT(no)
@@ -501,9 +501,8 @@ else
        AC_MSG_RESULT($ac_cv_have_tls)
 
        if test "$ac_cv_enable_ldap" = yes; then
-               CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gthread`"
-               LDAP_LIBS="$LDAP_LIBS -lldap `$GLIB_CONFIG --libs gthread`"
                AC_DEFINE(USE_LDAP, 1, Define if you want LDAP support in addressbook.)
+               LDAP_LIBS="$LDAP_LIBS -lldap"
                AC_SUBST(LDAP_LIBS)
                if test "$ac_cv_have_tls" = yes; then
                        AC_DEFINE(USE_LDAP_TLS, 1, Define if you want LDAP TLS support in addressbook.)
@@ -514,8 +513,8 @@ fi
 dnl for JPilot support in addressbook
 dnl no check for libraries; these are dynamically loaded
 AC_ARG_ENABLE(jpilot,
-       [  --enable-jpilot         Enable JPilot support [default=no]],
-       [ac_cv_enable_jpilot=$enableval], [ac_cv_enable_jpilot=no])
+       [  --disable-jpilot         Enable JPilot support [default=yes]],
+       [ac_cv_enable_jpilot=$enableval], [ac_cv_enable_jpilot=yes])
 AC_MSG_CHECKING([whether to use JPilot])
 if test "$ac_cv_enable_jpilot" = yes; then
        AC_MSG_RESULT(yes)
@@ -727,7 +726,7 @@ if test x"$ac_cv_enable_libetpan" = xyes; then
          if test "x$libetpan_result" = "xyes"; then
            AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine])
            LDFLAGS="$LDFLAGS `$libetpanconfig --libs 2>/dev/null`"
-           AC_TRY_LINK([], [db_mailstorage_init();], [libetpan_result=yes], [libetpan_result=no])
+           AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no])
            AC_MSG_RESULT([$libetpan_result])
          fi
        fi
@@ -735,15 +734,15 @@ if test x"$ac_cv_enable_libetpan" = xyes; then
           LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
           LIBETPAN_LIBS="`$libetpanconfig --libs`"
           LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"`
-          if test "$LIBETPAN_VERSION" -lt "038"; then
-               AC_MSG_ERROR([Sylpheed requires libetpan 0.38 or newer. See http://www.etpan.org/])
+          if test "$LIBETPAN_VERSION" -lt "039"; then
+               AC_MSG_ERROR([Sylpheed requires libetpan 0.39 or newer. See http://www.etpan.org/])
                AC_MSG_ERROR([You can use --disable-libetpan if you don't need IMAP4 support.])
           fi
           AC_SUBST(LIBETPAN_FLAGS)
           AC_SUBST(LIBETPAN_LIBS)
           AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP support.)
        else
-          AC_MSG_ERROR([Sylpheed requires libetpan 0.38 or newer. See http://www.etpan.org/ ])
+          AC_MSG_ERROR([Sylpheed requires libetpan 0.39 or newer. See http://www.etpan.org/ ])
           AC_MSG_ERROR([You can use --disable-libetpan if you don't need IMAP4 support.])
        fi
 else