[Xfce4-commits] <exo:stephan/gtk3> Bump dependencies and version number

[Stephan Arts]

Updating branch refs/heads/stephan/gtk3
         to f0c30b9f29b953c26cfbf20c82e811034068da55 (commit)
       from 39e085f04f07af3d79a8f167b367165b1422842a (commit)

commit f0c30b9f29b953c26cfbf20c82e811034068da55
Author: Stephan Arts <stephan at xfce.org>
Date:   Sat May 5 13:35:28 2012 +0200

    Bump dependencies and version number

 configure.in.in |   45 ++++++++-------------------------------------
 1 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 90f0473..0c8d1e3 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,9 +9,9 @@ dnl ***************************
 dnl *** Version information ***
 dnl ***************************
 m4_define([libexo_verinfo], [0:0:0])
-m4_define([libexo_version_api], [1])
+m4_define([libexo_version_api], [2])
 m4_define([libexo_version_major], [0])
-m4_define([libexo_version_minor], [8])
+m4_define([libexo_version_minor], [9])
 m4_define([libexo_version_micro], [0])
 m4_define([libexo_version_nano], [])
 m4_define([libexo_version_build], [@REVISION@])
@@ -157,41 +157,12 @@ XDT_I18N([@LINGUAS@], [exo-libexo_version_api()])
 dnl ***********************************
 dnl *** Check for required packages ***
 dnl ***********************************
-XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0])
-XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.24.0])
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0])
-XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.24.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.9.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.9.0])
-
-dnl ***********************************************************
-dnl *** Check if we need to build the GIO module (optional) ***
-dnl ***********************************************************
-XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.18.0], [gio-unix], [GIO-Unix features], [yes])
-GIOMODULEDIR=""
-BUILD_GIOMODULE=""
-if test x"$GIO_UNIX_FOUND" = x"yes"; then
-  if $PKG_CONFIG "--atleast-version=2.27.0" "gio-unix-2.0" >/dev/null 2>&1; then
-    BUILD_GIOMODULE="no"
-  else
-    dnl A GIO version >= 2.18 and < 2.27 was found
-    BUILD_GIOMODULE="yes"
-
-    dnl GIO directory for extensions
-    AC_ARG_WITH([gio-module-dir],
-                [AC_HELP_STRING([--with-gio-module-dir=PATH],
-                                [Specify where to install the exo gio module (default=autodetect)])],
-                [gio_module_dir="$withval"])
-    if test x"$gio_module_dir" = x""; then
-      GIOMODULEDIR="`$PKG_CONFIG gio-2.0 --variable giomoduledir`"
-    elif test x"$gio_module_dir" != x"distcheck"; then
-      GIOMODULEDIR="$gio_module_dir"
-    fi
-  fi
-fi
-AC_SUBST([GIOMODULEDIR])
-AM_CONDITIONAL([HAVE_GIOMODULEDIR], [test x"$GIOMODULEDIR" != x""])
-AM_CONDITIONAL([BUILD_GIOMODULE], [test x"$BUILD_GIOMODULE" = x"yes"])
+XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.30.0])
+XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.30.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.2.0])
+XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.30.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0])
 
 dnl *********************
 dnl *** Check for X11 ***