merged imap branch

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index d1d90937574eaec2faa2337440c1704b9b64480b..1042f247dce4ad1e4836c73725ddb88903fdcb93 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,10 +8,10 @@ PACKAGE=sylpheed-claws
 dnl version number
 MAJOR_VERSION=1
 MINOR_VERSION=9
-MICRO_VERSION=11
+MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=24
+EXTRA_VERSION=11
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -53,6 +53,13 @@ dnl GNOME 2.x installed?
 PKG_CHECK_MODULES(GNOME2, libgnome-2.0 >= 2.0, ac_enable_gnome2=yes, ac_enable_gnome2=no)
 AM_CONDITIONAL(SYLPHEED_GNOME2, test x"$ac_enable_gnome2" = x"yes")
 
+dnl libgnomeprint installed?
+PKG_CHECK_MODULES(GNOMEPRINT, libgnomeprint-2.2 libgnomeprintui-2.2, ac_enable_gnomeprint=yes, ac_enable_gnomeprint=no)
+AM_CONDITIONAL(SYLPHEED_GNOMEPRINT, test x"$ac_enable_gnomeprint" = x"yes")
+if test x$ac_enable_gnomeprint = xyes; then
+       AC_DEFINE(USE_GNOMEPRINT, 1, Define if you want libgnomeprint support)
+fi
+
 dnl Claws version
 AC_DEFINE(CLAWS, 1, Compiling Claws branch of sylpheed)
 
@@ -122,6 +129,8 @@ esac
 AC_MSG_RESULT([$os_win32])
 AM_CONDITIONAL(OS_WIN32, test x"$os_win32" = x"yes")
 
+CFLAGS="$CFLAGS -Wall"
+
 case "$target" in
 *-darwin*)
        CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
@@ -604,6 +613,29 @@ fi
 AC_SUBST(CLAMAV_LIBS)
 AM_CONDITIONAL(BUILD_CLAMAV_PLUGIN, test x"$ac_cv_enable_clamav_plugin" = xyes)
 
+dnl Libetpan
+libetpan=no
+AC_PATH_PROG(libetpanconfig, [libetpan-config])
+if test "x$libetpanconfig" != "x"; then
+  CPPFLAGS="$CPPFLAGS `$libetpanconfig --cflags 2>/dev/null`"
+  AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan=yes])
+  if test "x$libetpan" = "xyes"; then
+    AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine])
+    LDFLAGS="$LDFLAGS `$libetpanconfig --libs 2>/dev/null`"
+    AC_TRY_LINK([], [db_mailstorage_init();], [libetpan=yes], [libetpan=no])
+    AC_MSG_RESULT([$libetpan])
+  fi
+fi
+if test "x$libetpan" = "xyes"; then
+   LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
+   LIBETPAN_LIBS="`$libetpanconfig --libs`"
+else
+   AC_MSG_ERROR([Sylpheed requires libetpan.])
+fi
+
+AC_SUBST(LIBETPAN_FLAGS)
+AC_SUBST(LIBETPAN_LIBS)
+
 dnl ****************************
 dnl ** Final configure output **
 dnl ****************************
@@ -618,6 +650,7 @@ src/Makefile
 src/common/Makefile
 src/common/passcrypt.h
 src/gtk/Makefile
+src/etpan/Makefile
 src/plugins/Makefile
 src/plugins/demo/Makefile
 src/plugins/spamassassin/Makefile