Add LDAP contains query.

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a4f53c1e875cab2a94296f80f8a18e31edb96e5b..cbb8e4cf5f0e4eb00cd2222d7019e8ba73520ae1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=21
+EXTRA_VERSION=65
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
@@ -291,8 +291,20 @@ dnl Check for X-Face support
 AC_ARG_ENABLE(compface,
        [  --disable-compface      Do not use compface (X-Face)],
        [ac_cv_enable_compface=$enableval], [ac_cv_enable_compface=yes])
-if test "$ac_cv_enable_compface" = yes; then
-       AC_CHECK_LIB(compface, uncompface,,[ac_cv_enable_compface=no])
+AC_MSG_CHECKING([whether to use compface])
+if test x"$ac_cv_enable_compface" = xyes; then
+       AC_MSG_RESULT(yes)
+       AC_CHECK_LIB(compface, uncompface, 
+               [AC_DEFINE(HAVE_LIBCOMPFACE, 1, Define if you want compface support.)],
+               [ac_cv_enable_compface=no])
+       if test x"$ac_cv_enable_compface" = xyes; then
+               COMPFACE_LIBS="-lcompface"
+       else
+               COMPFACE_LIBS=""
+       fi
+       AC_SUBST(COMPFACE_LIBS)
+else
+       AC_MSG_RESULT(no)
 fi
 
 dnl for LDAP support in addressbook
@@ -355,12 +367,14 @@ if test "$ac_cv_enable_jpilot" = yes; then
                                 [ ac_cv_enable_jpilot=yes
                                   AC_DEFINE(USE_JPILOT, 1, Define if you want JPilot support in addressbook.) ])
        fi
-       AC_MSG_CHECKING([whether jpilot is available])
-       AC_MSG_RESULT($ac_cv_enable_jpilot)
 
-       if test "$ac_cv_enable_jpilot" = yes; then
-               LIBS="$LIBS -lpisock"
+       AC_CHECK_LIB(pisock, unpack_Address, [JPILOT_LIBS="-lpisock"], [JPILOT_LIBS="" ac_cv_enable_jpilot="no"])
+       if test x"$ac_cv_enable_jpilot" = xyes; then
+               AC_DEFINE(USE_JPILOT, 1, Define if you want JPilot support in addressbook.)
+       else
+               AC_MSG_NOTICE([JPilot support not available])
        fi
+       AC_SUBST(JPILOT_LIBS)
 else
        AC_MSG_RESULT(no)
 fi
@@ -409,7 +423,7 @@ AC_ARG_ENABLE(mathml-viewer-plugin,
        [  --enable-mathml-viewer-plugin    Build MathML-Viewer plugin [default=no]],
        [ac_cv_enable_mathml_viewer_plugin=$enableval], [ac_cv_enable_mathml_viewer_plugin=yes])
 if test x"$ac_cv_enable_mathml_viewer_plugin" = xyes; then
-       PKG_CHECK_MODULES(GTK_MATH_VIEW, gtkmathview >= 0.4.2, :, ac_cv_enable_mathml_viewer_plugin=no)
+       PKG_CHECK_MODULES(GTK_MATH_VIEW, gtkmathview >= 0.4.2 gtkmathview < 0.5, :, ac_cv_enable_mathml_viewer_plugin=no)
 
        if test x"$ac_cv_enable_mathml_viewer_plugin" = xyes; then
                AC_SUBST(GTK_MATH_VIEW_CFLAGS)