dnl version number
MAJOR_VERSION=1
MINOR_VERSION=9
-MICRO_VERSION=11
+MICRO_VERSION=12
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=31
+EXTRA_VERSION=14
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
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)
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`"
+ LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"`
+ if test "$LIBETPAN_VERSION" -lt "037"; then
+ AC_MSG_ERROR([Sylpheed requires libetpan 0.37 or newer. See http://www.etpan.org/])
+ fi
+else
+ AC_MSG_ERROR([Sylpheed requires libetpan 0.37 or newer. See http://www.etpan.org/ ])
+fi
+
+AC_SUBST(LIBETPAN_FLAGS)
+AC_SUBST(LIBETPAN_LIBS)
+
dnl ****************************
dnl ** Final configure output **
dnl ****************************
src/common/Makefile
src/common/passcrypt.h
src/gtk/Makefile
+src/etpan/Makefile
src/plugins/Makefile
src/plugins/demo/Makefile
src/plugins/spamassassin/Makefile