2011-11-07 [pawel] 3.7.10cvs77

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4a7cd383aeab50f1781e7a8c6d0e791bf6229c44..32b498b1519bc9dc3a68be001d9614bb93ba67c5 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=9
+MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=37
+EXTRA_VERSION=77
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -157,7 +157,7 @@ fi
 CFLAGS="$CFLAGS -Wall"
 
 #if test $USE_MAINTAINER_MODE = yes; then
-#      CFLAGS="-g -Wall -Wno-pointer-sign -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES"
+#      CFLAGS="-g -Wall -Wno-pointer-sign -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_DEPRECATED -DGSEAL_ENABLE"
 #fi
 
 pthread_name=
@@ -412,45 +412,26 @@ AC_ARG_ENABLE(gnutls,    [  --enable-gnutls      enable GnuTLS support],
 
 AC_MSG_RESULT($ac_cv_enable_gnutls)
 if test "x$ac_cv_enable_gnutls" != "xno"; then
-  OCPPFLAGS="$CPPFLAGS"
-  OLDFLAGS="$LDFLAGS"
-  GNUTLS_LIBS=""
-  PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.0.3,
-       [ac_cv_enable_gnutls=yes],
-       [ac_cv_enable_gnutls=no
-        echo "GnuTLS version >= 2.0.3 not found"])
-  if test "x$ac_cv_enable_gnutls" = "xyes"; then
-   AC_CHECK_HEADER(gpg-error.h,
-       [AC_CHECK_LIB(gpg-error, gpg_strerror,,
-               [ac_cv_enable_gnutls=no])
-       ],[ac_cv_enable_gnutls=no])
-  fi
-  if test "x$ac_cv_enable_gnutls" = "xyes"; then
-   GCRYPT_LIBS="-lgpg-error"
-   AC_CHECK_HEADER(gcrypt.h,
-       [AC_CHECK_LIB(gcrypt, gcry_control,,
-               [ac_cv_enable_gnutls=no])
-       ],[ac_cv_enable_gnutls=no])
-  fi
-  if test "x$ac_cv_enable_gnutls" = "xyes"; then
-       if test x"$platform_win32" = "xyes"; then
-               GNUTLS_LIBS="-lgnutls -lgcrypt ${GCRYPT_LIBS}"
-       else
-               GNUTLS_LIBS="-lgnutls -lgcrypt -lz ${GCRYPT_LIBS}"
-       fi
-  fi
-else
-   CPPFLAGS="$OCPPFLAGS"
-   LDFLAGS="$OLDFLAGS"
+        PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.2,
+        [
+                AC_DEFINE(USE_GNUTLS, 1, gnutls)
+                echo "Building with GnuTLS"
+        ],
+        [
+                echo "Building without gnutls"
+        ])
+        PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.11,
+        [
+                dnl No linking against libgcrypt needed
+        ],
+        [
+                dnl linking against libgcrypt *is* needed
+                GNUTLS_LIBS="$GNUTLS_LIBS -lgcrypt"
+        ])
+        AC_SUBST(GNUTLS_LIBS)
+        AC_SUBST(GNUTLS_CFLAGS)
 fi
 
-if test "x$ac_cv_enable_gnutls" = "xyes"; then
-  AC_DEFINE([USE_GNUTLS],1, [Define to use GnuTLS])
-else
-  GNUTLS_LIBS=""
-fi
-AC_SUBST(GNUTLS_LIBS)
-
 dnl password encryption
 OLDLIBS=$LIBS
 LIBS=
@@ -483,12 +464,23 @@ dnl ** GTK user interface **
 dnl ************************
 
 dnl Checks for GTK
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10)
+AC_ARG_ENABLE(gtk3,
+       AS_HELP_STRING([--enable-gtk3],
+               [Determines whether to use Gtk+ 3.0.]),
+               [ac_cv_enable_gtk3=$enableval],[ac_cv_enable_gtk3=no])
+AM_CONDITIONAL(GTK3, false)
+AM_CONDITIONAL(GTK2, true)
+if test x"$ac_cv_enable_gtk3" = x"yes"; then
+       PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0 cairo)
+       AM_CONDITIONAL(GTK3, true)
+       AM_CONDITIONAL(GTK2, false)
+else
+       PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.16)
 
-dnl --disable-deprecated switch for GTK2 purification
-AC_ARG_ENABLE(deprecated, [  --disable-deprecated  disable deprecated GTK functions. ],
+       dnl --disable-deprecated switch for GTK2 purification
+       AC_ARG_ENABLE(deprecated, [  --disable-deprecated  disable deprecated GTK functions. ],
                          [GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], [])
-
+fi
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)