2010-12-20 [colin] 3.7.8cvs12

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c8fad85a4edccfacb47e7d5b812c6d86467d7052..c06447cabbbd138361ca9f74ab6e9eae3637e223 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,10 +9,10 @@ PACKAGE=claws-mail
 dnl version number
 MAJOR_VERSION=3
 MINOR_VERSION=7
-MICRO_VERSION=6
+MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=59
+EXTRA_VERSION=12
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -156,7 +156,7 @@ fi
 CFLAGS="$CFLAGS -Wall"
 
 if test $USE_MAINTAINER_MODE = yes; then
-       CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES"
+       CFLAGS="-g -Wall -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES"
 fi
 
 pthread_name=
@@ -212,44 +212,24 @@ dnl ******************************
 dnl ** Check for required tools **
 dnl ** to build manuals         **
 dnl ******************************
-SAXON=`which saxon 2> /dev/null`
-if test $? -ne 0; then
-       SAXON=
-fi
-if test -z "$SAXON"; then
-        SAXONJAR='/usr/share/java/saxon.jar'
-        if test ! -f "$SAXONJAR"; then
-                SAXONJAR='/usr/local/share/java/saxon.jar'
-                if test ! -f "$SAXONJAR"; then
-                        SAXONJAR=
-                fi
-        fi
-fi
-AM_CONDITIONAL(MANUAL_PDF, test -n "$SAXON" -o -n "$SAXONJAR")
 
-DOCBOOK2TXT=`which docbook2txt 2> /dev/null`
-if test $? -ne 0; then
-       DOCBOOK2TXT=
-fi
-AM_CONDITIONAL(MANUAL_TXT, test -n "$DOCBOOK2TXT")
+AC_PATH_PROG(DOCBOOK2HTML, docbook2html)
+AC_PATH_PROG(DOCBOOK2TXT, docbook2txt)
+AC_PATH_PROG(DOCBOOK2PS, docbook2ps)
+AC_PATH_PROG(DOCBOOK2PDF, docbook2pdf)
 
-DOCBOOK2HTML=`which docbook2html 2> /dev/null`
-if test $? -ne 0; then
-        DOCBOOK2HTML=
-fi
 AM_CONDITIONAL(MANUAL_HTML, test -n "$DOCBOOK2HTML")
-
-DOCBOOK2PS=`which docbook2ps 2> /dev/null`
-if test $? -ne 0; then
-        DOCBOOK2PS=
-fi
+AM_CONDITIONAL(MANUAL_TXT, test -n "$DOCBOOK2TXT")
+AM_CONDITIONAL(MANUAL_PDF, test -n "$DOCBOOK2PDF")
 AM_CONDITIONAL(MANUAL_PS, test -n "$DOCBOOK2PS")
 
-if test -n "$DOCBOOK2TXT" -o -n "$DOCBOOK2HTML" -o -n "$DOCBOOK2PS" \
-       -o -n "$SAXON" -o -n "$SAXONJAR"; then
-       ac_cv_enable_manual="yes"
-else
-       ac_cv_enable_manual="no"
+if test x"$ac_cv_enable_manual" = x"yes"; then
+    if test -n "$DOCBOOK2TXT" -o -n "$DOCBOOK2HTML" \
+       -o -n "$DOCBOOK2PS" -o -n "$DOCBOOK2PDF"; then
+           ac_cv_enable_manual=yes
+       else
+           ac_cv_enable_manual=no
+    fi
 fi
 
 AM_CONDITIONAL(BUILD_MANUAL, test x"$ac_cv_enable_manual" = xyes)
@@ -686,6 +666,11 @@ elif test x"$ac_cv_enable_ldap" = xyes -a x"$ac_cv_enable_pthread" = xno; then
        AC_MSG_RESULT(no - LDAP support needs pthread support)
 
        ac_cv_enable_ldap=no
+elif test x"$platform_win32" = xyes; then
+       AC_MSG_RESULT(yes)
+       AC_DEFINE(USE_LDAP, 1, Define if you want LDAP support in addressbook.)
+       LDAP_LIBS="-lwldap32"
+       AC_SUBST(LDAP_LIBS)
 else
        AC_MSG_RESULT(yes)