2008-06-24 [colin] 3.4.0cvs109

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f4374ee17d201436ca6ce84efd932a8e1f17ee91..75ec113201766f3da077c51c217c67cd3d8a57db 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=28
+EXTRA_VERSION=109
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -482,6 +482,15 @@ dnl check if GDB is somewhere
        AC_MSG_RESULT($ac_cv_enable_crash_dialog)
 fi
 
+dnl generic umpc
+AC_ARG_ENABLE(generic-umpc,
+       [  --enable-generic-umpc   Enable generic UMPC code [default=no]],
+       [ac_cv_enable_generic_umpc=$enableval], [ac_cv_enable_generic_umpc=no])
+if test $ac_cv_enable_generic_umpc = yes; then
+       AC_DEFINE(GENERIC_UMPC, 1, Generic UMPC code)
+       AC_MSG_RESULT($ac_cv_enable_generic_umpc)
+fi
+
 dnl Maemo platform
 AC_ARG_ENABLE(maemo,
        [  --enable-maemo   build for the Maemo platform [default=no]],
@@ -502,23 +511,16 @@ if test $ac_cv_enable_maemo = yes; then
                else
                        AC_DEFINE(MAEMO, 1, Build for maemo)
                        AC_DEFINE(CHINOOK, 1, Maemo chinook)
+                       AC_DEFINE(GENERIC_UMPC, 1, Generic UMPC code)
                        ac_cv_enable_generic_umpc=yes
                fi
        else
                AC_DEFINE(MAEMO, 1, Build for maemo)
+               AC_DEFINE(GENERIC_UMPC, 1, Generic UMPC code)
                ac_cv_enable_generic_umpc=yes
        fi
 fi
 
-dnl generic umpc
-AC_ARG_ENABLE(generic-umpc,
-       [  --enable-generic-umpc   Enable generic UMPC code [default=no]],
-       [ac_cv_enable_generic_umpc=$enableval], [ac_cv_enable_generic_umpc=no])
-if test $ac_cv_enable_generic_umpc = yes; then
-       AC_DEFINE(GENERIC_UMPC, 1, Generic UMPC code)
-       AC_MSG_RESULT($ac_cv_enable_generic_umpc)
-fi
-
 PKG_CHECK_MODULES(CONIC, conic, ac_cv_enable_conic=yes,
          ac_cv_enable_conic=no)
 AC_SUBST(CONIC_CFLAGS)
@@ -658,6 +660,29 @@ else
                if test "$ac_cv_have_tls" = yes; then
                        AC_DEFINE(USE_LDAP_TLS, 1, Define if you want LDAP TLS support in addressbook.)
                fi
+               dnl As of OpenLDAP API version 3000 a number of functions has
+               dnl been deprecated. As Claws-mail compiles and runs on many
+               dnl platforms and many versions of OpenLDAP we need to be able
+               dnl to switch between the old and new API because new API has
+               dnl added new functions replacing old ones and at the same time
+               dnl old functions has been changed.
+               dnl If cross-compiling defaults to enable deprecated features
+               dnl for maximum portability
+               AC_MSG_CHECKING([The API version of OpenLDAP])
+               AC_RUN_IFELSE(
+                       [AC_LANG_PROGRAM(
+                        [#include <ldap.h>],
+                        [if (LDAP_API_VERSION >= 3000)
+                                       return 1
+                       ])],
+                       [AC_MSG_RESULT([version < 3000])
+                        AC_DEFINE(OPEN_LDAP_API_AT_LEAST_3000, 0, Define if OpenLDAP API is at least version 3000.)],
+                       [AC_MSG_RESULT([version >= 3000])
+                        AC_DEFINE(OPEN_LDAP_API_AT_LEAST_3000, 1, Define if OpenLDAP API is at least version 3000.)],
+                       [AC_MSG_RESULT([Enabling deprecated features in OpenLDAP])
+                        AC_DEFINE(OPEN_LDAP_API_AT_LEAST_3000, 0, Define if OpenLDAP API is at least version 3000.)
+                        AC_DEFINE(LDAP_DEPRECATED, 1, Define to activate deprecated features in OpenLDAP)]
+               )
        fi
 fi