sync with main 0.9.11cvs1

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e18fffee82cea90c2be7e207baea7b1ac32010a8..8dbe7fa4f070a899def4f3e1a4926c6e695012af 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,19 +3,21 @@ AC_PREREQ(2.50)
 AC_INIT(src/main.c)
 AC_CONFIG_AUX_DIR(config)
 
-PACKAGE=sylpheed
+PACKAGE=sylpheed-claws
 
 dnl version number
 MAJOR_VERSION=0
 MINOR_VERSION=9
-MICRO_VERSION=8
+MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=6
-if test $EXTRA_VERSION -eq 0; then
-    VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
+EXTRA_VERSION=2
+EXTRA_RELEASE=
+
+if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
+    VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}
 else
-    VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws${EXTRA_VERSION}
+    VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}cvs${EXTRA_VERSION}
 fi
 
 dnl set $target
@@ -77,7 +79,7 @@ AM_PROG_LEX
 AC_PROG_YACC
 AC_PROG_LIBTOOL
 
-SYLPHEED_ACLOCAL_INCLUDE(ac)
+SYLPHEED_ACLOCAL_INCLUDE(m4)
 
 case "$target" in
 *-darwin*)
@@ -90,6 +92,7 @@ AM_ICONV
 dnl for gettext
 ALL_LINGUAS="bg cs de el en_GB es fr hr hu it ja ko nl pl pt_BR ru sk sr sv zh_CN zh_TW.Big5"
 AM_GNU_GETTEXT([use-libtool])
+AM_GNU_GETTEXT_VERSION(0.12.1)
 dnl AC_CHECK_FUNC(gettext, AC_CHECK_LIB(intl, gettext))
 localedir='${prefix}/${DATADIRNAME}/locale'
 AC_SUBST(localedir)
@@ -348,16 +351,27 @@ if test "$ac_cv_enable_ldap" = yes; then
                             [ ac_cv_enable_ldap=yes ],
                             [ ac_cv_enable_ldap=no ],
                             $LDAP_LIBS)
+
+               AC_CHECK_LIB(ldap, ldap_start_tls_s,
+                            [ ac_cv_have_tls=yes ],
+                            [ ac_cv_have_tls=no ])
+
        fi
 
        AC_MSG_CHECKING([whether ldap library is available])
        AC_MSG_RESULT($ac_cv_enable_ldap)
 
+       AC_MSG_CHECKING([whether TLS library is available])
+       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.)
                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.)
+               fi
        fi
 else
        AC_MSG_RESULT(no)
@@ -523,7 +537,7 @@ AC_OUTPUT([
 Makefile
 sylpheed.spec
 intl/Makefile
-ac/Makefile
+m4/Makefile
 po/Makefile.in
 src/common/version.h
 src/Makefile