Mercurial > hg > release > icedtea7-2.0
changeset 2475:772a1342ad73
Check for Gtk+, GIO, fontconfig and CUPS and enable building against them at compile-time.
2011-09-21 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(JDK_CHANGESET): Bump to bring in latest
GConf->GIO fix for proxy detection.
(JDK_SHA256SUM): Likewise.
(ICEDTEA_ENV): Set USE_SYSTEM_CUPS, CUPS_LIBS,
CUPS_CFLAGS, USE_SYSTEM_GTK, GTK_LIBS, GTK_CFLAGS,
USE_SYSTEM_GIO, GIO_LIBS, GIO_CFLAGS, USE_SYSTEM_FONTCONFIG,
FONTCONFIG_LIBS, FONTCONFIG_CFLAGS.
* acinclude.m4,
(IT_CHECK_FOR_GTK): Add --enable-system-gtk and detect
Gtk+ if enabled.
(IT_CHECK_FOR_GIO): Likewise for --enable-system-gio.
(IT_CHECK_FOR_FONTCONFIG): Likewise for --enable-system-fontconfig.
(IT_CHECK_FOR_CUPS): Detect both CUPS headers and libraries,
and set CUPS_LIBS.
* configure.ac: Remove old CUPS detection.
Add calls to IT_CHECK_FOR_GTK, IT_CHECK_FOR_GIO,
IT_CHECK_FOR_FONTCONFIG and IT_CHECK_FOR_CUPS.
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Wed, 21 Sep 2011 16:16:01 +0100 |
parents | 094e2ade4134 |
children | 8301bc66941a |
files | ChangeLog Makefile.am acinclude.m4 configure.ac |
diffstat | 4 files changed, 141 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Sep 09 17:34:17 2011 +0100 +++ b/ChangeLog Wed Sep 21 16:16:01 2011 +0100 @@ -1,3 +1,24 @@ +2011-09-21 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + (JDK_CHANGESET): Bump to bring in latest + GConf->GIO fix for proxy detection. + (JDK_SHA256SUM): Likewise. + (ICEDTEA_ENV): Set USE_SYSTEM_CUPS, CUPS_LIBS, + CUPS_CFLAGS, USE_SYSTEM_GTK, GTK_LIBS, GTK_CFLAGS, + USE_SYSTEM_GIO, GIO_LIBS, GIO_CFLAGS, USE_SYSTEM_FONTCONFIG, + FONTCONFIG_LIBS, FONTCONFIG_CFLAGS. + * acinclude.m4, + (IT_CHECK_FOR_GTK): Add --enable-system-gtk and detect + Gtk+ if enabled. + (IT_CHECK_FOR_GIO): Likewise for --enable-system-gio. + (IT_CHECK_FOR_FONTCONFIG): Likewise for --enable-system-fontconfig. + (IT_CHECK_FOR_CUPS): Detect both CUPS headers and libraries, + and set CUPS_LIBS. + * configure.ac: Remove old CUPS detection. + Add calls to IT_CHECK_FOR_GTK, IT_CHECK_FOR_GIO, + IT_CHECK_FOR_FONTCONFIG and IT_CHECK_FOR_CUPS. + 2011-09-09 Andrew John Hughes <ahughes@redhat.com> * Makefile.am:
--- a/Makefile.am Fri Sep 09 17:34:17 2011 +0100 +++ b/Makefile.am Wed Sep 21 16:16:01 2011 +0100 @@ -6,7 +6,7 @@ HOTSPOT_CHANGESET = 1dd9b3d73b22 JAXP_CHANGESET = c40983d6ae70 JAXWS_CHANGESET = 83db5e316798 -JDK_CHANGESET = 80fe75968a0b +JDK_CHANGESET = a8b6a570543b LANGTOOLS_CHANGESET = fb7fb3071b64 OPENJDK_CHANGESET = 3defd24c2671 @@ -14,7 +14,7 @@ HOTSPOT_SHA256SUM = ffb1831a63e950bb7ade46a5382cb71d2603e0f40b3f758eb346833e18fca150 JAXP_SHA256SUM = 6ab0cab1965edb28e4093b55436abd04fbffe0b0251016043c75246c4ee9dc2d JAXWS_SHA256SUM = 5567c90ce2857016365b2e346783a3b16ec0e76b80586a0371f601b4fed01f21 -JDK_SHA256SUM = c083590700305ffdea31a1487956d8304cdbb3a5da79e92c3f2efc3e8a26a06d +JDK_SHA256SUM = bab2b25355dfb4300912b199eaf9633e693368e3fb671f1f6e9e08622079faeb LANGTOOLS_SHA256SUM = 9ddc00ec50fd2f5e331dc2bc10da4e23b69bf644eb92d50b39a2003c18fb5aa1 OPENJDK_SHA256SUM = 4043a75c2c4385dd735f8dbbf2369311ce1b951217c9dbe9bba9609e24eb291e @@ -473,7 +473,10 @@ VERBOSE="$(VERBOSE)" \ STATIC_CXX="false" \ BUILD_GCC="$(CC)" \ - BUILD_CPP="$(CXX)" + BUILD_CPP="$(CXX)" \ + USE_SYSTEM_CUPS="true" \ + CUPS_LIBS="${CUPS_LIBS}" \ + CUPS_CFLAGS="${CUPS_CFLAGS}" if ENABLE_CACAO ICEDTEA_ENV += \ @@ -546,6 +549,27 @@ GIF_CFLAGS="${GIF_CFLAGS}" endif +if USE_SYSTEM_GTK +ICEDTEA_ENV += \ + USE_SYSTEM_GTK="true" \ + GTK_LIBS="${GTK_LIBS}" \ + GTK_CFLAGS="${GTK_CFLAGS}" +endif + +if USE_SYSTEM_GIO +ICEDTEA_ENV += \ + USE_SYSTEM_GIO="true" \ + GIO_LIBS="${GIO_LIBS}" \ + GIO_CFLAGS="${GIO_CFLAGS}" +endif + +if USE_SYSTEM_FONTCONFIG +ICEDTEA_ENV += \ + USE_SYSTEM_FONTCONFIG="true" \ + FONTCONFIG_LIBS="${FONTCONFIG_LIBS}" \ + FONTCONFIG_CFLAGS="${FONTCONFIG_CFLAGS}" +endif + # OpenJDK boot build environment. ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \ BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" \
--- a/acinclude.m4 Fri Sep 09 17:34:17 2011 +0100 +++ b/acinclude.m4 Wed Sep 21 16:16:01 2011 +0100 @@ -2058,6 +2058,95 @@ AC_SUBST(ENABLE_SYSTEM_GIF) ]) +AC_DEFUN_ONCE([IT_CHECK_FOR_GTK], +[ + AC_MSG_CHECKING([whether to use the system Gtk+ install]) + AC_ARG_ENABLE([system-gtk], + [AS_HELP_STRING(--enable-system-gtk,use the system Gtk+ [[default=yes]])], + [ + ENABLE_SYSTEM_GTK="${enableval}" + ], + [ + ENABLE_SYSTEM_GTK="yes" + ]) + AC_MSG_RESULT(${ENABLE_SYSTEM_GTK}) + if test x"${ENABLE_SYSTEM_GTK}" = "xyes"; then + dnl Check for Gtk+ headers and libraries. + PKG_CHECK_MODULES(GTK, gtk+-2.0,[GTK_FOUND=yes],[GTK_FOUND=no]) + if test "x${GTK_FOUND}" = xno + then + AC_MSG_ERROR([Could not find Gtk+; install Gtk+ or build with --disable-system-gtk to use the in-tree headers.]) + fi + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + fi + AM_CONDITIONAL(USE_SYSTEM_GTK, test x"${ENABLE_SYSTEM_GTK}" = "xyes") + AC_SUBST(ENABLE_SYSTEM_GTK) +]) + +AC_DEFUN_ONCE([IT_CHECK_FOR_GIO], +[ + AC_MSG_CHECKING([whether to use the system GIO install]) + AC_ARG_ENABLE([system-gio], + [AS_HELP_STRING(--enable-system-gio,use the system GIO [[default=yes]])], + [ + ENABLE_SYSTEM_GIO="${enableval}" + ], + [ + ENABLE_SYSTEM_GIO="yes" + ]) + 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,[GIO_FOUND=yes],[GIO_FOUND=no]) + if test "x${GIO_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) + fi + AM_CONDITIONAL(USE_SYSTEM_GIO, test x"${ENABLE_SYSTEM_GIO}" = "xyes") + AC_SUBST(ENABLE_SYSTEM_GIO) +]) + +AC_DEFUN_ONCE([IT_CHECK_FOR_FONTCONFIG], +[ + AC_MSG_CHECKING([whether to use the system fontconfig install]) + AC_ARG_ENABLE([system-fontconfig], + [AS_HELP_STRING(--enable-system-fontconfig,use the system fontconfig [[default=yes]])], + [ + ENABLE_SYSTEM_FONTCONFIG="${enableval}" + ], + [ + ENABLE_SYSTEM_FONTCONFIG="yes" + ]) + AC_MSG_RESULT(${ENABLE_SYSTEM_FONTCONFIG}) + if test x"${ENABLE_SYSTEM_FONTCONFIG}" = "xyes"; then + dnl Check for Fontconfig+ headers and libraries. + PKG_CHECK_MODULES(FONTCONFIG, fontconfig,[FONTCONFIG_FOUND=yes],[FONTCONFIG_FOUND=no]) + if test "x${FONTCONFIG_FOUND}" = xno + then + AC_MSG_ERROR([Could not find fontconfig; install fontconfig or build with --disable-system-fontconfig to use the in-tree headers.]) + fi + AC_SUBST(FONTCONFIG_CFLAGS) + AC_SUBST(FONTCONFIG_LIBS) + fi + AM_CONDITIONAL(USE_SYSTEM_FONTCONFIG, test x"${ENABLE_SYSTEM_FONTCONFIG}" = "xyes") + AC_SUBST(ENABLE_SYSTEM_FONTCONFIG) +]) + +AC_DEFUN_ONCE([IT_CHECK_FOR_CUPS], +[ + dnl Check for CUPS headers and libraries. + AC_CHECK_LIB([cups], [cupsServer], + , [AC_MSG_ERROR("Could not find CUPS library; install CUPS.")]) + AC_CHECK_HEADERS([cups/cups.h cups/ppd.h], + , [AC_MSG_ERROR("Could not find CUPS headers; install CUPS (including cups-devel on binary distros).")]) + CUPS_LIBS="-lcups" + AC_SUBST(CUPS_LIBS) +]) + AC_DEFUN([IT_ENABLE_JAMVM], [ AC_MSG_CHECKING(whether to use JamVM as VM)
--- a/configure.ac Fri Sep 09 17:34:17 2011 +0100 +++ b/configure.ac Wed Sep 21 16:16:01 2011 +0100 @@ -161,9 +161,6 @@ AC_SUBST([GCJ]) dnl pkgconfig cannot be used to find these headers and libraries. -AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[] - ,[AC_MSG_ERROR("CUPS headers were not found - - try installing cups-devel.")]) AC_CHECK_HEADERS([X11/X.h],[] ,[AC_MSG_ERROR("xorg headers were not found - try installing xorg-x11-proto-devel.")]) @@ -173,6 +170,10 @@ IT_CHECK_FOR_PNG IT_CHECK_FOR_GIF IT_CHECK_FOR_LCMS +IT_CHECK_FOR_GTK +IT_CHECK_FOR_GIO +IT_CHECK_FOR_FONTCONFIG +IT_CHECK_FOR_CUPS AC_CONFIG_FILES([remove-intree-libraries.sh]) dnl Check for Xproto headers and libraries.