sync with main 0.9.11cvs1
[claws.git] / configure.ac
index afa5fec..8dbe7fa 100644 (file)
@@ -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=9
+MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=33
-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
@@ -349,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)