# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1421864442 0
# Node ID b08e78ab545a872d45eeb512671b1dfba4f9195d
# Parent  bf9210d67acb205eb669e76d24a20bd2c54f798c
PR2161: RHEL 6 has a version of GIO which meets the version criteria, but has no g_settings_*

2015-01-07  Andrew John Hughes  <gnu.andrew@member.fsf.org>

	PR2161: RHEL 6 has a version of GIO which meets
	the version criteria, but has no g_settings_*
	* NEWS: Updated.
	* acinclude.m4:
	(IT_CHECK_FOR_GIO): Replace version test with
	a check for g_settings_new.

diff -r bf9210d67acb -r b08e78ab545a ChangeLog
--- a/ChangeLog	Wed Jan 21 18:17:25 2015 +0000
+++ b/ChangeLog	Wed Jan 21 18:20:42 2015 +0000
@@ -1,3 +1,12 @@
+2015-01-07  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR2161: RHEL 6 has a version of GIO which meets
+	the version criteria, but has no g_settings_*
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_CHECK_FOR_GIO): Replace version test with
+	a check for g_settings_new.
+
 2015-01-06  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR2064: Unset OS before running OpenJDK build
diff -r bf9210d67acb -r b08e78ab545a NEWS
--- a/NEWS	Wed Jan 21 18:17:25 2015 +0000
+++ b/NEWS	Wed Jan 21 18:20:42 2015 +0000
@@ -109,6 +109,7 @@
   - PR2123: SunEC provider crashes when built using system NSS
   - PR2124: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS
   - PR2135: Race condition in SunEC provider with system NSS
+  - PR2161: RHEL 6 has a version of GIO which meets the version criteria, but has no g_settings_*
 
 New in release 2.5.3 (2014-10-14):
 
diff -r bf9210d67acb -r b08e78ab545a acinclude.m4
--- a/acinclude.m4	Wed Jan 21 18:17:25 2015 +0000
+++ b/acinclude.m4	Wed Jan 21 18:20:42 2015 +0000
@@ -2129,10 +2129,13 @@
   AC_MSG_RESULT(${ENABLE_SYSTEM_GIO})
   if test x"${ENABLE_SYSTEM_GIO}" = "xyes"; then
     dnl Check for Gio+ headers and libraries.
-    PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.26,[GIO_FOUND=yes],[GIO_FOUND=no])
-    if test "x${GIO_FOUND}" = xno
-    then
-      AC_MSG_ERROR([Could not find GIO >= 2.26; install GIO or build with --disable-system-gio to use the in-tree headers.])
+    PKG_CHECK_MODULES(GIO, gio-2.0,[GIO_FOUND=yes],[GIO_FOUND=no])
+    OLD_LIBS=${LIBS}
+    LIBS="${LIBS} ${GIO_LIBS}"
+    AC_CHECK_FUNC([g_settings_new],[GIO_FUNC_FOUND=yes],[GIO_FUNC_FOUND=no])
+    LIBS=${OLD_LIBS}
+    if test "x${GIO_FOUND}" = xno -o "x${GIO_FUNC_FOUND}" = xno; then
+      AC_MSG_ERROR([Could not find GIO; install GIO or build with --disable-system-gio to use the in-tree headers.])
     fi
     AC_SUBST(GIO_CFLAGS)
     AC_SUBST(GIO_LIBS)