sync with sylpheed 0.6.5cvs18

[claws.git] / configure.in

diff --git a/configure.in b/configure.in
index b3f345114eea896b313d7909302a3d37769b388a..5bb8bd21234631143bf4179cb61a0d0a15922b83 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,10 +5,10 @@ PACKAGE=sylpheed
 dnl version number
 MAJOR_VERSION=0
 MINOR_VERSION=6
-MICRO_VERSION=3
+MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws6
+EXTRA_VERSION=claws40
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
@@ -42,7 +42,6 @@ AC_SUBST(LT_AGE)
 dnl Specify a header configuration file
 AM_CONFIG_HEADER(config.h)
 
-AM_PROG_LIBTOOL
 AM_MAINTAINER_MODE
 
 dnl Checks for programs.
@@ -55,6 +54,7 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_CPP
 dnl AC_PROG_RANLIB
+AM_PROG_LIBTOOL
 AM_PROG_LEX
 AC_PROG_YACC
 
@@ -173,7 +173,7 @@ AC_MSG_CHECKING([whether to use LDAP])
 if test "$ac_cv_enable_ldap" = yes; then
        AC_MSG_RESULT(yes)
        AC_CHECK_HEADERS(ldap.h lber.h pthread.h,
-                        [ LIBS="$LIBS -lldap -llber -lpthread -lresolv"
+                        [ LIBS="$LIBS -lldap -llber -lpthread -lresolv `glib-config --libs gthread`"
                           AC_DEFINE(USE_LDAP) ],
                         [ ac_cv_enable_ldap=no ])
        AC_MSG_CHECKING([whether ldap is available])
@@ -344,9 +344,9 @@ echo ""
 echo "gdk-pixbuf : $ac_cv_enable_gdk_pixbuf"
 echo "gdk_imlib  : $ac_cv_enable_imlib"
 echo "GPGME      : $ac_cv_enable_gpgme"
-echo "OpenSSL    : $ac_cv_enable_ssl"
 echo "JPilot     : $ac_cv_enable_jpilot"
 echo "LDAP       : $ac_cv_enable_ldap"
+echo "OpenSSL    : $ac_cv_enable_ssl"
 echo "compface   : $ac_cv_enable_compface"
 echo "libjconv   : $ac_cv_enable_jconv"
 echo "IPv6       : $ac_cv_enable_ipv6"