[libgdata] build: Directly encode maximum GLib version



commit 77680e7f84a6cb39ed7719849a89a9a23ae1268e
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Sun Jun 22 17:04:09 2014 +0100

    build: Directly encode maximum GLib version
    
    If we use the GLIB_VERSION_2_38 macro, compilation will fail with older
    versions of GLib which do not have that macro defined. Use the
    underlying G_ENCODE_VERSION() macro instead.

 configure.ac |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e1d5cf7..f0fc958 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
 # Requirements
 GLIB_REQS=2.31.0
 GLIB_MIN_REQUIRED=GLIB_VERSION_2_32
-GLIB_MAX_ALLOWED=GLIB_VERSION_2_38
+GLIB_MAX_ALLOWED="G_ENCODE_VERSION (2, 38)"
 GIO_REQS=2.17.3
 SOUP_REQS=2.42.0
 SOUP_MIN_REQUIRED=SOUP_VERSION_2_42
@@ -85,7 +85,7 @@ PKG_CHECK_MODULES(GDATA, [$GDATA_PACKAGES])
 
 # Minimum and maximum requirements for GLib and libsoup, etc.
 GDATA_CFLAGS="$GDATA_CFLAGS -DSOUP_VERSION_MIN_REQUIRED=$SOUP_MIN_REQUIRED 
-DSOUP_VERSION_MAX_ALLOWED=$SOUP_MAX_ALLOWED"
-GDATA_CFLAGS="$GDATA_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=$GLIB_MIN_REQUIRED 
-DGLIB_VERSION_MAX_ALLOWED=$GLIB_MAX_ALLOWED"
+GDATA_CFLAGS="$GDATA_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=$GLIB_MIN_REQUIRED 
-DGLIB_VERSION_MAX_ALLOWED=\"$GLIB_MAX_ALLOWED\""
 GDATA_CFLAGS="$GDATA_CFLAGS -DJSON_VERSION_MIN_REQUIRED=$JSON_GLIB_MIN_REQUIRED 
-DJSON_VERSION_MAX_ALLOWED=$JSON_GLIB_MAX_ALLOWED"
 
 AC_SUBST(GDATA_CFLAGS)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]