MICRO_VERSION=6
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=62
if test $EXTRA_VERSION -eq 0; then
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
else
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
[ 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
[ --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)