more sync with sylpheed 0.5.0pre4

[claws.git] / configure.in

diff --git a/configure.in b/configure.in
index 288f5f5080e2de62a7b79234e3ee103ad914fba3..0ab89e9bd71232fb886fe9be681ea4f642045b2e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,11 +4,11 @@ PACKAGE=sylpheed
 
 dnl version number
 MAJOR_VERSION=0
-MINOR_VERSION=4
-MICRO_VERSION=66
-INTERFACE_AGE=66
-BINARY_AGE=66
-EXTRA_VERSION=claws3
+MINOR_VERSION=5
+MICRO_VERSION=0
+INTERFACE_AGE=0
+BINARY_AGE=0
+EXTRA_VERSION=claws4
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
@@ -16,6 +16,14 @@ AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 
+dnl GNOME installed?
+AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
+if test "$GNOME_CONFIG" != no; then
+       gnomedir="`gnome-config --prefix`"
+       AC_SUBST(gnomedir)
+fi
+AM_CONDITIONAL(SYLPHEED_GNOME, test -d "$gnomedir")
+
 dnl libtool versioning
 LT_RELEASE=$MAJOR_VERSION.$MINOR_VERSION
 LT_CURRENT=`expr $MICRO_VERSION - $INTERFACE_AGE`
@@ -42,6 +50,8 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_CPP
 dnl AC_PROG_RANLIB
+AM_PROG_LEX
+AC_PROG_YACC
 
 SYLPHEED_ACLOCAL_INCLUDE(ac)
 
@@ -98,6 +108,34 @@ if test "$ac_cv_disable_compface" = no; then
        AC_CHECK_LIB(compface, uncompface)
 fi
 
+dnl for JPilot support in addressbook
+AC_ARG_ENABLE(jpilot,
+       [  --enable-jpilot         Enable JPilot support [default=no]],
+       [ac_cv_enable_jpilot=$enableval], [ac_cv_enable_jpilot=no])
+
+AC_MSG_CHECKING([whether to use jpilot])
+if test "$ac_cv_enable_jpilot" = yes; then
+       AC_MSG_RESULT(yes)
+       LIBS="$LIBS -lpisock"
+       AC_DEFINE(USE_JPILOT)
+else
+       AC_MSG_RESULT(no)
+fi
+
+dnl for LDAP support in addressbook
+AC_ARG_ENABLE(ldap,
+       [  --enable-ldap         Enable JPilot support [default=no]],
+       [ac_cv_enable_ldap=$enableval], [ac_cv_enable_ldap=no])
+
+AC_MSG_CHECKING([whether to use ldap])
+if test "$ac_cv_enable_ldap" = yes; then
+       AC_MSG_RESULT(yes)
+       LIBS="$LIBS -lldap -llber -lpthread -lresolv"
+       AC_DEFINE(USE_LDAP)
+else
+       AC_MSG_RESULT(no)
+fi
+
 dnl Check for libjconv
 AC_ARG_ENABLE(jconv,
        [  --disable-jconv         Do not use libjconv],
@@ -110,9 +148,9 @@ AC_CHECK_LIB(xpg4, setlocale)
 dnl AC_CHECK_LIB(kcc, KCC_filter)
 
 dnl for GThread support
-AC_ARG_ENABLE(threads,
-       [  --enable-threads        Enable multithread support [default=no]],
-       [use_threads=$enableval], [use_threads=no])
+dnl AC_ARG_ENABLE(threads,
+dnl    [  --enable-threads        Enable multithread support [default=no]],
+dnl    [use_threads=$enableval], [use_threads=no])
 
 AC_MSG_CHECKING([whether to use threads])
 if test x"$use_threads" = xyes ; then
@@ -177,7 +215,6 @@ AC_CHECK_HEADERS(fcntl.h sys/file.h unistd.h paths.h \
                 sys/param.h sys/utsname.h \
                 wchar.h wctype.h)
 
-
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_OFF_T