2010-04-15 [pawel] 3.7.5cvs48

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2ae3938938c1ce94e9fbad5c21e28ef6a85cb206..dbd9dbd5e82661df3179def84a00fb255c4e72e9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=6
+EXTRA_VERSION=48
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -465,7 +465,7 @@ dnl ** GTK user interface **
 dnl ************************
 
 dnl Checks for GTK
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10)
 
 dnl --disable-deprecated switch for GTK2 purification
 AC_ARG_ENABLE(deprecated, [  --disable-deprecated  disable deprecated GTK functions. ],
@@ -973,7 +973,11 @@ if test x"$ac_cv_enable_libetpan" = xyes; then
        if test "x$libetpan_result" = "xyes"; then
           LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
           LIBETPAN_LIBS="`$libetpanconfig --libs`"
+           LIBETPAN_STABLE=`$libetpanconfig --version | grep -v ^0`
           LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"`
+           if test x"$LIBETPAN_STABLE" != "x"; then
+                LIBETPAN_VERSION="100"
+           fi
           if test "$LIBETPAN_VERSION" -lt "057"; then
                AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/])
                AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
@@ -992,38 +996,6 @@ else
 fi
 AM_CONDITIONAL(CLAWS_LIBETPAN, test "x$libetpan_result" = "xyes")
 
-
-dnl Printing support.
-PKG_CHECK_MODULES(GTK210, gtk+-2.0 >= 2.10, ac_cv_have_gtk210=yes, ac_cv_have_gtk210=no)
-
-AC_MSG_CHECKING([whether to use libgnomeprint])
-AC_ARG_ENABLE(gnomeprint,
-       [  --disable-gnomeprint         disable libgnomeprint support],
-       [ac_cv_enable_gnomeprint=$enableval], [ac_cv_enable_gnomeprint=auto])
-
-if test x$ac_cv_have_gtk210 = xyes; then
-       ac_cv_enable_gnomeprint="no"
-fi
-
-if test x$ac_cv_enable_gnomeprint = xyes \
-       -o \( x$ac_cv_enable_gnomeprint = xauto \
-          -a x$ac_cv_have_gtk210 = xno \); then
-       AC_MSG_RESULT(yes)
-       PKG_CHECK_MODULES(GNOMEPRINT, libgnomeprint-2.2 libgnomeprintui-2.2,
-                         ac_cv_enable_gnomeprint=yes, ac_cv_enable_gnomeprint=no)
-       if test x"$ac_cv_enable_gnomeprint" = xyes; then
-               AC_DEFINE(USE_GNOMEPRINT, 1, Define if you want libgnomeprint support)
-       else
-               AC_MSG_RESULT(not found)
-               AC_MSG_WARN([*** libgnomeprintui wasn't found    ***])
-               AC_MSG_WARN([*** using built-in printing support ***])
-       fi
-else
-       ac_cv_enable_gnomeprint=no
-       AC_MSG_RESULT(no)
-fi
-AM_CONDITIONAL(CLAWS_GNOMEPRINT, test x"$ac_cv_enable_gnomeprint" = x"yes")
-
 AC_MSG_CHECKING([whether to use valgrind])
 AC_ARG_ENABLE(valgrind,
        [  --disable-valgrind           disable valgrind support for debugging],
@@ -1096,6 +1068,12 @@ manual/es/dist/pdf/Makefile
 manual/es/dist/ps/Makefile
 manual/es/dist/html/Makefile
 manual/es/dist/txt/Makefile
+manual/de/Makefile
+manual/de/dist/Makefile
+manual/de/dist/pdf/Makefile
+manual/de/dist/ps/Makefile
+manual/de/dist/html/Makefile
+manual/de/dist/txt/Makefile
 claws-mail.pc
 ])
 
@@ -1113,8 +1091,6 @@ echo "enchant           : $ac_cv_enable_enchant"
 echo "IMAP4             : $ac_cv_enable_libetpan"
 echo "NNTP              : $ac_cv_enable_libetpan"
 echo "Crash dialog      : $ac_cv_enable_crash_dialog"
-echo "Libgnomeprint     : $ac_cv_enable_gnomeprint"
-echo "GTK+ print support: $ac_cv_have_gtk210"
 echo "LibSM             : $ac_cv_enable_libsm"
 echo "DBUS              : $enable_dbus"
 echo "NetworkManager    : $enable_networkmanager_support"