/hg/icedtea7-forest/jdk: 3 new changesets

[andrew at icedtea.classpath.org]

changeset d7417dd2b5e7 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=d7417dd2b5e7
author: andrew
date: Wed Apr 29 20:05:42 2015 +0100

	PR2161: RHEL 6 has a version of GIO which meets the version criteria, but has no g_settings_*
	Summary: Remove version check for GIO; g_settings needs additional variable setting after PR2233 anyway.


changeset 4bb37e10549f in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=4bb37e10549f
author: andrew
date: Wed Apr 29 20:18:59 2015 +0100

	PR1661: Cleanup SYSTEM_GCONF option and allow it to be set false


changeset 0b7452eac993 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=0b7452eac993
author: andrew
date: Wed Apr 29 20:54:10 2015 +0100

	PR2320: Allow use of system GConf
	Summary: Add support for system GConf to jdk_generic_profile.sh


diffstat:

 make/java/net/FILES_c.gmk   |   2 +-
 make/java/net/Makefile      |   4 ++--
 make/jdk_generic_profile.sh |  44 +++++++++++++++++++++++++++++++++++++-------
 3 files changed, 40 insertions(+), 10 deletions(-)

diffs (101 lines):

diff -r 4e3ea67d3b69 -r 0b7452eac993 make/java/net/FILES_c.gmk
--- a/make/java/net/FILES_c.gmk	Fri Apr 24 17:45:59 2015 +0100
+++ b/make/java/net/FILES_c.gmk	Wed Apr 29 20:54:10 2015 +0100
@@ -64,7 +64,7 @@
     FILES_c += PlainDatagramSocketImpl.c
 endif
 
-ifndef USE_SYSTEM_GCONF
+ifneq ($(SYSTEM_GCONF), true)
    FILES_c += gconf_fp.c
 endif
 
diff -r 4e3ea67d3b69 -r 0b7452eac993 make/java/net/Makefile
--- a/make/java/net/Makefile	Fri Apr 24 17:45:59 2015 +0100
+++ b/make/java/net/Makefile	Wed Apr 29 20:54:10 2015 +0100
@@ -86,7 +86,7 @@
     $(PLATFORM_SRC)/native/sun/net/sdp $(PLATFORM_SRC)/native/sun/net/spi \
     $(PLATFORM_SRC)/native/sun/net
 
-ifndef USE_SYSTEM_GCONF
+ifneq ($(SYSTEM_GCONF), true)
   vpath %.c	$(PLATFORM_SRC)/native/common/deps/gconf2
 endif
 
@@ -123,7 +123,7 @@
 endif
 endif # PLATFORM
 
-ifdef USE_SYSTEM_GCONF
+ifeq ($(SYSTEM_GCONF), true)
   OTHER_LDLIBS += $(GCONF_LIBS) $(GOBJECT_LIBS)
   CPPFLAGS += $(GCONF_CFLAGS) $(GOBJECT_CFLAGS) -DUSE_SYSTEM_GCONF
 else
diff -r 4e3ea67d3b69 -r 0b7452eac993 make/jdk_generic_profile.sh
--- a/make/jdk_generic_profile.sh	Fri Apr 24 17:45:59 2015 +0100
+++ b/make/jdk_generic_profile.sh	Wed Apr 29 20:54:10 2015 +0100
@@ -527,13 +527,11 @@
 # GIO_CFLAGS and GIO_LIBS tell the compiler how to compile and
 # link against libgio
 if [ -x "${pkgconfig}" ] ; then
-  if "${pkgconfig}" --atleast-version=2.6 gio-2.0 ; then
-    if [ "${GIO_CFLAGS}" = "" ] ; then
-      GIO_CFLAGS=$("${pkgconfig}" --cflags gio-2.0)
-    fi
-    if [ "${GIO_LIBS}" = "" ] ; then
-      GIO_LIBS=$("${pkgconfig}" --libs gio-2.0)
-    fi
+  if [ "${GIO_CFLAGS}" = "" ] ; then
+    GIO_CFLAGS=$("${pkgconfig}" --cflags gio-2.0)
+  fi
+  if [ "${GIO_LIBS}" = "" ] ; then
+    GIO_LIBS=$("${pkgconfig}" --libs gio-2.0)
   fi
 fi
 export GIO_CFLAGS
@@ -583,6 +581,33 @@
 echo "Using FONTCONFIG_CFLAGS=${FONTCONFIG_CFLAGS}"
 echo "Using FONTCONFIG_LIBS=${FONTCONFIG_LIBS}"
 
+# Export variables for system gconf
+# GCONF_CFLAGS, GCONF_LIBS, GOBJECT_CFLAGS and
+# GOBJECT_LIBS tell the compiler how to compile and
+# link against gconf
+if [ -x "${pkgconfig}" ] ; then
+  if [ "${GCONF_CFLAGS}" = "" ] ; then
+    GCONF_CFLAGS=$("${pkgconfig}" --cflags gconf-2.0)
+  fi
+  if [ "${GCONF_LIBS}" = "" ] ; then
+    GCONF_LIBS=$("${pkgconfig}" --libs gconf-2.0)
+  fi
+  if [ "${GOBJECT_CFLAGS}" = "" ] ; then
+    GOBJECT_CFLAGS=$("${pkgconfig}" --cflags gobject-2.0)
+  fi
+  if [ "${GOBJECT_LIBS}" = "" ] ; then
+    GOBJECT_LIBS=$("${pkgconfig}" --libs gobject-2.0)
+  fi
+fi
+export GCONF_CFLAGS
+export GCONF_LIBS
+export GOBJECT_CFLAGS
+export GOBJECT_LIBS
+echo "Using GCONF_CFLAGS=${GCONF_CFLAGS}"
+echo "Using GCONF_LIBS=${GCONF_LIBS}"
+echo "Using GOBJECT_CFLAGS=${GOBJECT_CFLAGS}"
+echo "Using GOBJECT_LIBS=${GOBJECT_LIBS}"
+
 # Setup nss.cfg using location of NSS libraries
 if [ -x "${pkgconfig}" ] ; then
   if [ "${NSS_LIBDIR}" = "" ] ; then
@@ -620,6 +645,11 @@
   export SYSTEM_GIO=true
 fi
 
+if [ "x${GCONF_LIBS}" != "x" -a "x${GOBJECT_LIBS}" != "x" ] ; then
+  echo "GConf detected; enabling system linking.";
+  export SYSTEM_GCONF=true
+fi
+
 # IcedTea default; turn on the ARM32 JIT
 export ARM32JIT=true