2008-10-09 [colin] 3.6.0cvs21

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f153785b226ce5b502736f82281e3e3db4d8bf5a..a0ddf4fc0eaf41883a2e8668dee88fcd950df584 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=19
+EXTRA_VERSION=21
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -366,36 +366,18 @@ else
        AC_MSG_RESULT(no)
 fi
 
-dnl Check for OpenSSL
-AC_ARG_ENABLE(openssl,
-       [  --disable-openssl    disable OpenSSL support.],
-       [ac_cv_enable_openssl=$enableval], [ac_cv_enable_openssl=yes])
 dnl GNUTLS
+AC_ARG_ENABLE(openssl,    [ --enable-openssl      enable GnuTLS support],
+            [ac_cv_enable_openssl=$enableval], [ac_cv_enable_openssl=yes])
 AC_ARG_ENABLE(gnutls,    [ --enable-gnutls      enable GnuTLS support],
-            [ac_cv_enable_gnutls=$enableval], [ac_cv_enable_gnutls=no])
-if test x$ac_cv_enable_openssl = xyes && test x$ac_cv_enable_gnutls != xyes; then
-       ac_cv_enable_gnutls="no"
-fi
-if test x$ac_cv_enable_gnutls = xyes; then
-         ac_cv_enable_openssl="no"
-fi
+            [ac_cv_enable_gnutls=$enableval], [ac_cv_enable_gnutls=yes])
 
-AC_MSG_CHECKING([whether to use OpenSSL])
-if test x"$ac_cv_enable_openssl" = xyes; then
-       AC_MSG_RESULT(yes)
-       PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.7, :, ac_cv_enable_openssl=no)
-       if test x$ac_cv_enable_openssl = xyes; then
-               AC_DEFINE(USE_OPENSSL, 1, Define if you want OpenSSL support)
-       else
-               AC_MSG_RESULT(not found)
-               AC_MSG_WARN([*** OpenSSL will not be supported ***])
+if test "x$ac_cv_enable_gnutls" != "xyes"; then
+       if test "x$ac_cv_enable_openssl" = "xyes"; then
+               AC_MSG_WARN(*** Using GnuTLS instead of OpenSSL due to licensing ***)
+               ac_cv_enable_gnutls="yes"
        fi
-else
-       AC_MSG_RESULT(no)
 fi
-AC_SUBST(OPENSSL_CFLAGS)
-AC_SUBST(OPENSSL_LIBS)
-
 AC_MSG_CHECKING([whether to use GnuTLS])
 if test "x$ac_cv_enable_gnutls" != "xno"; then
   OCPPFLAGS="$CPPFLAGS"
@@ -980,6 +962,34 @@ 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],
@@ -1061,7 +1071,6 @@ echo "$PACKAGE $VERSION"
 echo ""
 echo "JPilot            : $ac_cv_enable_jpilot"
 echo "LDAP              : $ac_cv_enable_ldap"
-echo "OpenSSL           : $ac_cv_enable_openssl"
 echo "gnuTLS            : $ac_cv_enable_gnutls"
 echo "iconv             : $am_cv_func_iconv"
 echo "compface          : $ac_cv_enable_compface"
@@ -1070,6 +1079,7 @@ 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"