Mercurial > hg > release > icedtea6-1.5
changeset 551:192f950f18eb cacao
2008-01-07 Lillian Angel <langel@redhat.com>
* Makefile.am
(gcjwebplugin.so): Added check for ENABLE_PLUGIN.
* Makefile.in: Regenerate.
* configure: Regenerate.
* configure.ac: Added option --disable-gcjwebplugin to disable
compilation of gcjwebplugin.
| author | Lillian Angel <langel@redhat.com> |
|---|---|
| date | Mon, 07 Jan 2008 12:14:51 -0500 |
| parents | c3ef83c0a95b |
| children | e93a5415014f |
| files | ChangeLog Makefile.am Makefile.in configure configure.ac |
| diffstat | 5 files changed, 62 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jan 04 09:53:45 2008 -0500 +++ b/ChangeLog Mon Jan 07 12:14:51 2008 -0500 @@ -1,3 +1,12 @@ +2008-01-07 Lillian Angel <langel@redhat.com> + + * Makefile.am + (gcjwebplugin.so): Added check for ENABLE_PLUGIN. + * Makefile.in: Regenerate. + * configure: Regenerate. + * configure.ac: Added option --disable-gcjwebplugin to disable + compilation of gcjwebplugin. + 2008-01-04 Matthias Klose <doko@ubuntu.com> * configure.ac: Only check for hg if --with-openjdk-src-zip is not
--- a/Makefile.am Fri Jan 04 09:53:45 2008 -0500 +++ b/Makefile.am Mon Jan 07 12:14:51 2008 -0500 @@ -438,10 +438,13 @@ $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk/ j2se_only - cp -af gcjwebplugin.so \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) - cp -af gcjwebplugin.so \ - $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) + if test "$(ENABLE_PLUGIN)" == "yes" ; \ + then \ + cp -af gcjwebplugin.so \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) ; \ + cp -af gcjwebplugin.so \ + $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \ + fi @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR) icedtea-debug: stamps/bootstrap-directory-symlink.stamp \ @@ -451,10 +454,13 @@ $(ICEDTEA_ENV) \ -C openjdk/ \ j2se_fastdebug_only - cp -af gcjwebplugin.so \ - $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) - cp -af gcjwebplugin.so \ - $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) + if test "$(ENABLE_PLUGIN)" == "yes" ; \ + then \ + cp -af gcjwebplugin.so \ + $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) ; \ + cp -af gcjwebplugin.so \ + $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \ + fi @echo "IcedTea (debug build) is served:" \ $(BUILD_OUTPUT_DIR)-debug @@ -664,11 +670,14 @@ # gcjwebplugin.so. gcjwebplugin.so: gcjwebplugin.cc - $(CXX) $(CXXFLAGS) $(MOZILLA_CFLAGS) \ - $(MOZILLA_LIBS) $(GLIB_CFLAGS) $(GLIB_LIBS) \ - $(GTK_CFLAGS) $(GTK_LIBS) \ - -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \ - -fpic -shared -o $@ $< + if test "$(ENABLE_PLUGIN)" == "yes" ; \ + then \ + $(CXX) $(CXXFLAGS) $(MOZILLA_CFLAGS) \ + $(MOZILLA_LIBS) $(GLIB_CFLAGS) $(GLIB_LIBS) \ + $(GTK_CFLAGS) $(GTK_LIBS) \ + -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \ + -fpic -shared -o $@ $< ; \ + fi clean-gcjwebplugin: rm -f gcjwebplugin.so
--- a/Makefile.in Fri Jan 04 09:53:45 2008 -0500 +++ b/Makefile.in Mon Jan 07 12:14:51 2008 -0500 @@ -99,6 +99,7 @@ ECJ = @ECJ@ ECJ_JAR = @ECJ_JAR@ EGREP = @EGREP@ +ENABLE_PLUGIN = @ENABLE_PLUGIN@ EXEEXT = @EXEEXT@ FIND = @FIND@ FREETYPE2_INC_DIR = @FREETYPE2_INC_DIR@ @@ -1042,11 +1043,14 @@ # gcjwebplugin.so. gcjwebplugin.so: gcjwebplugin.cc - $(CXX) $(CXXFLAGS) $(MOZILLA_CFLAGS) \ - $(MOZILLA_LIBS) $(GLIB_CFLAGS) $(GLIB_LIBS) \ - $(GTK_CFLAGS) $(GTK_LIBS) \ - -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \ - -fpic -shared -o $@ $< + if test "$(ENABLE_PLUGIN)" == "yes" ; \ + then \ + $(CXX) $(CXXFLAGS) $(MOZILLA_CFLAGS) \ + $(MOZILLA_LIBS) $(GLIB_CFLAGS) $(GLIB_LIBS) \ + $(GTK_CFLAGS) $(GTK_LIBS) \ + -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \ + -fpic -shared -o $@ $< ; \ + fi clean-gcjwebplugin: rm -f gcjwebplugin.so
--- a/configure Fri Jan 04 09:53:45 2008 -0500 +++ b/configure Mon Jan 07 12:14:51 2008 -0500 @@ -713,6 +713,7 @@ SYSTEM_GCJ_DIR SYSTEM_ICEDTEA_DIR SYSTEM_ANT_DIR +ENABLE_PLUGIN WITH_ICEDTEA_TRUE WITH_ICEDTEA_FALSE BUILD_ARCH_DIR @@ -1354,6 +1355,7 @@ --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors + --disable-gcjwebplugin Disable compilation of browser plugin --enable-fast-build optimize for quick building: use -O0 and do not build documentation @@ -4760,6 +4762,15 @@ +# Check whether --enable-gcjwebplugin was given. +if test "${enable_gcjwebplugin+set}" = set; then + enableval=$enable_gcjwebplugin; ENABLE_PLUGIN="$val" +else + ENABLE_PLUGIN='yes' +fi + + + # Check whether --with-icedtea was given. if test "${with_icedtea+set}" = set; then @@ -9077,6 +9088,7 @@ fi +if test "$ENABLE_PLUGIN" = "yes"; then if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then @@ -9881,6 +9893,7 @@ +fi cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -10734,6 +10747,7 @@ for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF SYSTEM_ANT_DIR!$SYSTEM_ANT_DIR$ac_delim +ENABLE_PLUGIN!$ENABLE_PLUGIN$ac_delim WITH_ICEDTEA_TRUE!$WITH_ICEDTEA_TRUE$ac_delim WITH_ICEDTEA_FALSE!$WITH_ICEDTEA_FALSE$ac_delim BUILD_ARCH_DIR!$BUILD_ARCH_DIR$ac_delim
--- a/configure.ac Fri Jan 04 09:53:45 2008 -0500 +++ b/configure.ac Mon Jan 07 12:14:51 2008 -0500 @@ -68,6 +68,12 @@ ]) AC_SUBST(SYSTEM_ANT_DIR) +AC_ARG_ENABLE([gcjwebplugin], + [AS_HELP_STRING([--disable-gcjwebplugin], + [Disable compilation of browser plugin])], + [ENABLE_PLUGIN="$val"], [ENABLE_PLUGIN='yes']) +AC_SUBST(ENABLE_PLUGIN) + AC_ARG_WITH([icedtea], [AS_HELP_STRING([--with-icedtea], [build IcedTea with system-installed IcedTea])], @@ -137,6 +143,7 @@ , [AC_MSG_ERROR("zlib not found - try installing zlib-devel")]) dnl Check for plugin support headers and libraries. +if test "$ENABLE_PLUGIN" = "yes"; then PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, [MOZILLA_FOUND=yes], \ [MOZILLA_FOUND=no]) if test "x${MOZILLA_FOUND}" = xno @@ -178,5 +185,6 @@ AC_SUBST(GLIB_LIBS) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) +fi AC_OUTPUT