2010-03-25 [paul] 3.7.5cvs39

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e6aa9be1e922f94c347e7fc6facdd3e7b7b90bf9..59e3b515a8a98677e7a2d74c7d7b25c9d2f2fcae 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,10 +9,10 @@ PACKAGE=claws-mail
 dnl version number
 MAJOR_VERSION=3
 MINOR_VERSION=7
-MICRO_VERSION=3
+MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=47
+EXTRA_VERSION=39
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -382,9 +382,9 @@ fi
 
 dnl GNUTLS
 AC_MSG_CHECKING([whether to use GnuTLS])
-AC_ARG_ENABLE(openssl,    [ --enable-openssl      enable GnuTLS support],
+AC_ARG_ENABLE(openssl,    [  --enable-openssl      enable GnuTLS support],
             [ac_cv_enable_openssl=$enableval], [ac_cv_enable_openssl=no])
-AC_ARG_ENABLE(gnutls,    [ --enable-gnutls      enable GnuTLS support],
+AC_ARG_ENABLE(gnutls,    [  --enable-gnutls      enable GnuTLS support],
             [ac_cv_enable_gnutls=$enableval], [ac_cv_enable_gnutls=yes])
 
 if test "x$ac_cv_enable_gnutls" != "xyes"; then
@@ -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. ],
@@ -992,38 +992,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 +1064,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 +1087,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"