[Xfce4-commits] <exo:xfce-4.8> Fix gio-unix 2.27 detection (bug #7124).

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
         to ab580acb12d03ee18a3313a16dc9d4f1070413aa (commit)
       from 946a4420d39701faae336b5e4045b19975e0aa6c (commit)

commit ab580acb12d03ee18a3313a16dc9d4f1070413aa
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Jan 30 00:19:16 2011 +0100

    Fix gio-unix 2.27 detection (bug #7124).
    
    (cherry picked from commit acc27174635e14f63d5b4143d8a3775f01a54c0d)

 configure.in.in |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 8652d3a..677f80a 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -155,10 +155,9 @@ XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.18.0], [gio-unix], [GI
 GIOMODULEDIR=""
 BUILD_GIOMODULE=""
 if test x"$GIO_UNIX_FOUND" = x"yes"; then
-  dnl Do not build the module after GIO 2.27
-  XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX_227], [gio-unix-2.0], [2.27.0], [gio-unix], [GIO-Unix too new], [yes])
-
-  if test x"$GIO_UNIX_227_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"
 
@@ -176,7 +175,7 @@ if test x"$GIO_UNIX_FOUND" = x"yes"; then
 fi
 AC_SUBST([GIOMODULEDIR])
 AM_CONDITIONAL([HAVE_GIOMODULEDIR], [test x"$GIOMODULEDIR" != x""])
-AM_CONDITIONAL([BUILD_GIOMODULE], [test x"$BUILD_GIOMODULE" != x""])
+AM_CONDITIONAL([BUILD_GIOMODULE], [test x"$BUILD_GIOMODULE" = x"yes"])
 
 dnl *********************
 dnl *** Check for X11 ***
@@ -358,7 +357,7 @@ dnl ***************************
 echo
 echo "Build Configuration:"
 echo
-if test x"$GIO_UNIX_227_FOUND" = x"yes"; then
+if test x"$BUILD_GIOMODULE" = x"no"; then
 echo "* Build GIO module:     no (not needed after glib 2.27)"
 elif test x"$GIO_UNIX_FOUND" = x"yes"; then
 echo "* Build GIO module:     yes"