changeset in /hg/icedtea: 2008-01-07 Lillian Angel <langel at red...
Lillian Angel
langel at redhat.com
Mon Jan 7 09:28:29 PST 2008
changeset 5a993be294b4 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5a993be294b4
description:
2008-01-07 Lillian Angel <langel at 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.
diffstat:
5 files changed, 77 insertions(+), 27 deletions(-)
ChangeLog | 9 +++++++++
Makefile.am | 35 ++++++++++++++++++++++-------------
Makefile.in | 36 +++++++++++++++++++++++-------------
configure | 16 +++++++++++++++-
configure.ac | 8 ++++++++
diffs (241 lines):
diff -r b4320fbec908 -r 5a993be294b4 ChangeLog
--- 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-04 Matthias Klose <doko at ubuntu
+2008-01-07 Lillian Angel <langel at 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 at ubuntu.com>
* configure.ac: Only check for hg if --with-openjdk-src-zip is not
diff -r b4320fbec908 -r 5a993be294b4 Makefile.am
--- a/Makefile.am Fri Jan 04 09:53:45 2008 -0500
+++ b/Makefile.am Mon Jan 07 12:14:51 2008 -0500
@@ -414,10 +414,13 @@ icedtea: stamps/tools.stamp stamps/plugs
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/
- 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 \
@@ -427,10 +430,13 @@ icedtea-debug: stamps/bootstrap-director
$(ICEDTEA_ENV) \
-C openjdk/ \
debug_build
- 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
@@ -640,11 +646,14 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
# 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
diff -r b4320fbec908 -r 5a993be294b4 Makefile.in
--- a/Makefile.in Fri Jan 04 09:53:45 2008 -0500
+++ b/Makefile.in Mon Jan 07 12:14:51 2008 -0500
@@ -84,6 +84,7 @@ ECJ = @ECJ@
ECJ = @ECJ@
ECJ_JAR = @ECJ_JAR@
EGREP = @EGREP@
+ENABLE_PLUGIN = @ENABLE_PLUGIN@
EXEEXT = @EXEEXT@
FIND = @FIND@
FREETYPE2_INC_DIR = @FREETYPE2_INC_DIR@
@@ -895,10 +896,13 @@ icedtea: stamps/tools.stamp stamps/plugs
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/
- 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 \
@@ -908,10 +912,13 @@ icedtea-debug: stamps/bootstrap-director
$(ICEDTEA_ENV) \
-C openjdk/ \
debug_build
- 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
@@ -1093,11 +1100,14 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
# 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
diff -r b4320fbec908 -r 5a993be294b4 configure
--- 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_GCJ_DIR
SYSTEM_ICEDTEA_DIR
SYSTEM_ANT_DIR
+ENABLE_PLUGIN
WITH_ICEDTEA_TRUE
WITH_ICEDTEA_FALSE
BUILD_ARCH_DIR
@@ -1351,6 +1352,7 @@ Optional Features:
--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
@@ -4756,6 +4758,15 @@ fi
+# 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
@@ -9035,6 +9046,7 @@ fi
fi
+if test "$ENABLE_PLUGIN" = "yes"; then
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@ -9839,6 +9851,7 @@ fi
+fi
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -10685,6 +10698,7 @@ for ac_last_try in false false false fal
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
@@ -10724,7 +10738,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 38; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 39; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -r b4320fbec908 -r 5a993be294b4 configure.ac
--- 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_ARG_WITH([ant-home],
])
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])],
@@ -136,6 +142,7 @@ AC_CHECK_LIB(z, main,
, [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
@@ -177,5 +184,6 @@ AC_SUBST(GLIB_LIBS)
AC_SUBST(GLIB_LIBS)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
+fi
AC_OUTPUT
More information about the distro-pkg-dev
mailing list