Fix LDAP.

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b96a3cca70896bdafbf16d541519b0bfadff5886..7773d897ecd7730489bb33b60f049b8de5fc020b 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=60
+EXTRA_VERSION=68
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
@@ -292,16 +292,17 @@ AC_ARG_ENABLE(compface,
        [  --disable-compface      Do not use compface (X-Face)],
        [ac_cv_enable_compface=$enableval], [ac_cv_enable_compface=yes])
 AC_MSG_CHECKING([whether to use compface])
-if test "$ac_cv_enable_compface" = yes; then
+if test x"$ac_cv_enable_compface" = xyes; then
        AC_MSG_RESULT(yes)
-       AC_MSG_CHECKING([whether compface library is available])
-       AC_MSG_RESULT($ac_cv_enable_compface)
-
-       if test "$ac_cv_enable_compface" = yes; then
-               COMPFACE_LIBS="$COMPFACE_LIBS -lcompface"
-               AC_DEFINE(HAVE_LIBCOMPFACE, 1, Define if you want compface support.)
-               AC_SUBST(COMPFACE_LIBS)
+       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
@@ -366,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