/hg/icedtea7: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jun 12 18:21:34 UTC 2015
changeset 237b37f0f9d1 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=237b37f0f9d1
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jun 12 15:16:54 2015 +0100
Added tag icedtea-2.6.0pre22 for changeset cfb7718f2b3b
changeset 909fa12f498c in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=909fa12f498c
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jun 12 19:21:14 2015 +0100
PR2320: Allow use of system GConf
2015-06-12 Andrew John Hughes <gnu.andrew at member.fsf.org>
* INSTALL:
Document GConf2 option and requirements.
* Makefile.am:
(ICEDTEA_ENV): Add SYSTEM_GCONF, GCONF_LIBS
and GCONF_CFLAGS.
* acinclude.m4:
(IT_CHECK_FOR_GCONF): Add --enable-system-gconf
for building using the system installation of
GConf. This is disabled by default on
systems where the preferable GSettings API in GIO
is found.
* configure.ac: Call IT_CHECK_FOR_GCONF.
diffstat:
.hgtags | 1 +
ChangeLog | 15 +++++++++++++++
INSTALL | 4 ++++
Makefile.am | 3 +++
acinclude.m4 | 31 +++++++++++++++++++++++++++++++
configure.ac | 1 +
6 files changed, 55 insertions(+), 0 deletions(-)
diffs (113 lines):
diff -r cfb7718f2b3b -r 909fa12f498c .hgtags
--- a/.hgtags Tue Jun 09 17:46:23 2015 +0100
+++ b/.hgtags Fri Jun 12 19:21:14 2015 +0100
@@ -53,3 +53,4 @@
0000000000000000000000000000000000000000 icedtea-2.6.0pre20
d20e49a7dbc81830fc1d2b0e13c21cf00876c542 icedtea-2.6.0pre20
7a49b37d9628f41a80e2487695e58cd3ccc8a34c icedtea-2.6.0pre21
+cfb7718f2b3b0743e6cf8be785472cf2502aaf41 icedtea-2.6.0pre22
diff -r cfb7718f2b3b -r 909fa12f498c ChangeLog
--- a/ChangeLog Tue Jun 09 17:46:23 2015 +0100
+++ b/ChangeLog Fri Jun 12 19:21:14 2015 +0100
@@ -1,3 +1,18 @@
+2015-06-12 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * INSTALL:
+ Document GConf2 option and requirements.
+ * Makefile.am:
+ (ICEDTEA_ENV): Add SYSTEM_GCONF, GCONF_LIBS
+ and GCONF_CFLAGS.
+ * acinclude.m4:
+ (IT_CHECK_FOR_GCONF): Add --enable-system-gconf
+ for building using the system installation of
+ GConf. This is disabled by default on
+ systems where the preferable GSettings API in GIO
+ is found.
+ * configure.ac: Call IT_CHECK_FOR_GCONF.
+
2015-06-09 Andrew John Hughes <gnu.andrew at member.fsf.org>
* NEWS: Add additional Red Hat and
diff -r cfb7718f2b3b -r 909fa12f498c INSTALL
--- a/INSTALL Tue Jun 09 17:46:23 2015 +0100
+++ b/INSTALL Fri Jun 12 19:21:14 2015 +0100
@@ -22,6 +22,7 @@
xsltproc (for bootstrapping)
ant >= 1.6.5 with the regexp task from ant-nodeps
glib2-devel (for --enable-system-gio)
+GConf2-devel (for --enable-system-gconf)
gtk2-devel (for --enable-system-gtk)
giflib-devel (for --enable-system-gif)
libpng-devel (for --enable-system-png)
@@ -105,6 +106,9 @@
Gtk+ instead of trying to dynamically open it at runtime.
* --enable-system-gio: Build and link against the system installation of
GIO instead of trying to dynamically open it at runtime.
+* --enable-system-gconf: Build and link against the system installation of
+ GConf instead of trying to dynamically open it at runtime (only enabled
+ by default on systems with older versions of Glib/GIO without the GSettings API)
* --enable-system-fontconfig: Build and link against the system installation of
fontconfig instead of trying to dynamically open it at runtime.
* --enable-system-pcsc: Build and link against the system installation of
diff -r cfb7718f2b3b -r 909fa12f498c Makefile.am
--- a/Makefile.am Tue Jun 09 17:46:23 2015 +0100
+++ b/Makefile.am Fri Jun 12 19:21:14 2015 +0100
@@ -518,6 +518,9 @@
SYSTEM_GSETTINGS="${ENABLE_SYSTEM_GSETTINGS}" \
GIO_LIBS="${GIO_LIBS}" \
GIO_CFLAGS="${GIO_CFLAGS}" \
+ SYSTEM_GCONF="${ENABLE_SYSTEM_GCONF}" \
+ GCONF_LIBS="${GCONF_LIBS}" \
+ GCONF_CFLAGS="${GCONF_CFLAGS}" \
SYSTEM_FONTCONFIG="${ENABLE_SYSTEM_FONTCONFIG}" \
FONTCONFIG_LIBS="${FONTCONFIG_LIBS}" \
FONTCONFIG_CFLAGS="${FONTCONFIG_CFLAGS}" \
diff -r cfb7718f2b3b -r 909fa12f498c acinclude.m4
--- a/acinclude.m4 Tue Jun 09 17:46:23 2015 +0100
+++ b/acinclude.m4 Fri Jun 12 19:21:14 2015 +0100
@@ -2960,3 +2960,34 @@
AM_CONDITIONAL([JAVAC_LACKS_UNDERSCORED_LITERALS], test x"${it_cv_underscore}" = "xyes")
AC_PROVIDE([$0])dnl
])
+
+AC_DEFUN_ONCE([IT_CHECK_FOR_GCONF],
+[
+ AC_REQUIRE([IT_CHECK_FOR_GIO])
+ AC_MSG_CHECKING([whether to use the system GConf install])
+ AC_ARG_ENABLE([system-gconf],
+ [AS_HELP_STRING(--enable-system-gconf,use the system GConf [[default=no if g_settings is available]])],
+ [
+ ENABLE_SYSTEM_GCONF="${enableval}"
+ ],
+ [
+ if test x"${ENABLE_SYSTEM_GSETTINGS}" = "xtrue"; then
+ ENABLE_SYSTEM_GCONF="no"
+ else
+ ENABLE_SYSTEM_GCONF="yes"
+ fi
+ ])
+ AC_MSG_RESULT(${ENABLE_SYSTEM_GCONF})
+ if test x"${ENABLE_SYSTEM_GCONF}" = "xyes"; then
+ dnl Check for Gconf+ headers and libraries.
+ PKG_CHECK_MODULES(GCONF, gconf-2.0 gobject-2.0,[GCONF_FOUND=yes],[GCONF_FOUND=no])
+ if test "x${GCONF_FOUND}" = xno; then
+ AC_MSG_ERROR([Could not find GConf; install GConf or build with --disable-system-gconf to use the in-tree headers.])
+ fi
+ AC_SUBST(GCONF_CFLAGS)
+ AC_SUBST(GCONF_LIBS)
+ ENABLE_SYSTEM_GCONF=true
+ fi
+ AM_CONDITIONAL(USE_SYSTEM_GCONF, test x"${ENABLE_SYSTEM_GCONF}" = "xtrue")
+ AC_SUBST(ENABLE_SYSTEM_GCONF)
+])
diff -r cfb7718f2b3b -r 909fa12f498c configure.ac
--- a/configure.ac Tue Jun 09 17:46:23 2015 +0100
+++ b/configure.ac Fri Jun 12 19:21:14 2015 +0100
@@ -215,6 +215,7 @@
IT_CHECK_FOR_LCMS
IT_CHECK_FOR_GTK
IT_CHECK_FOR_GIO
+IT_CHECK_FOR_GCONF
IT_ENABLE_INFINALITY
IT_CHECK_FOR_CUPS
IT_CHECK_FOR_SYSCALLS
More information about the distro-pkg-dev
mailing list