2007-10-07 [colin] 3.0.2cvs31

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index dac1bdfbf6ccd7fc23d2da6b3ca7ae1654ddc887..0cd5a822a44630980c3358859d8ae519e2b84403 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,10 +8,10 @@ PACKAGE=claws-mail
 dnl version number
 MAJOR_VERSION=3
 MINOR_VERSION=0
-MICRO_VERSION=0
+MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=9
+EXTRA_VERSION=31
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -136,6 +136,11 @@ esac
 AC_MSG_RESULT([$env_cygwin])
 AM_CONDITIONAL(CYGWIN, test x"$env_cygwin" = x"yes")
 
+if test "$GCC" = "yes"
+then
+       CFLAGS="$CFLAGS -Wno-unused-function"
+fi
+
 CFLAGS="$CFLAGS -Wall"
 
 pthread_name=
@@ -151,7 +156,7 @@ case "$target" in
        CFLAGS="$CFLAGS -mms-bitfields"
        LIBS="$LIBS -l${pthread_name} -lws2_32 -lregex"
        ;;
-*-sun-solaris2.8)
+*-*-solaris*)
        CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
        CFLAGS="$CFLAGS -DSOLARIS"
        ;;
@@ -843,12 +848,15 @@ fi
 AM_CONDITIONAL(CLAWS_LIBETPAN, test "x$libetpan_result" = "xyes")
 
 
-dnl Libgnomeprint
+dnl Printing support. GTK will be used if present and gnomeprint is not explicitely enabled
+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=yes])
-if test x$ac_cv_enable_gnomeprint = xyes; then
+       [ac_cv_enable_gnomeprint=$enableval], [ac_cv_enable_gnomeprint=auto])
+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)
@@ -860,6 +868,7 @@ if test x$ac_cv_enable_gnomeprint = xyes; then
                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")
@@ -952,7 +961,7 @@ echo "IPv6          : $ac_cv_enable_ipv6"
 echo "GNU/aspell    : $ac_cv_enable_aspell"
 echo "IMAP4         : $ac_cv_enable_libetpan"
 echo "Crash dialog  : $ac_cv_enable_crash_dialog"
-echo "Libgnomeprint : $ac_cv_enable_gnomeprint"
+echo "Libgnomeprint : $ac_cv_enable_gnomeprint (GTK+ 2.10: $ac_cv_have_gtk210)"
 echo "LibSM         : $ac_cv_enable_libsm"
 echo "Manual        : $ac_cv_enable_manual"
 echo "Plugins       : $PLUGINS"