changeset in /hg/icedtea: Add support for --disable-nimbus.
Andrew John Hughes
ahughes at redhat.com
Mon May 18 18:31:28 PDT 2009
changeset 2a131daaa86d in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2a131daaa86d
description:
Add support for --disable-nimbus.
2009-05-14 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
Add support for DISABLE_NIMBUS, correct
use of bootclasspath/sourcepath in extra-files.stamp
* acinclude.m4:
(AC_CHECK_ENABLE_NIMBUS): New macro.
* configure.ac:
Enable --disable-nimbus, only search for JIBX
and dependencies when enabled.
diffstat:
4 files changed, 59 insertions(+), 18 deletions(-)
ChangeLog | 11 +++++++++++
Makefile.am | 38 +++++++++++++++++++++++---------------
acinclude.m4 | 17 +++++++++++++++++
configure.ac | 11 ++++++++---
diffs (166 lines):
diff -r 9f5cce422771 -r 2a131daaa86d ChangeLog
--- a/ChangeLog Thu May 14 14:08:42 2009 +0100
+++ b/ChangeLog Thu May 14 21:25:31 2009 +0100
@@ -1,3 +1,14 @@ 2009-05-14 Andrew John Hughes <ahughes
+2009-05-14 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Add support for DISABLE_NIMBUS, correct
+ use of bootclasspath/sourcepath in extra-files.stamp
+ * acinclude.m4:
+ (AC_CHECK_ENABLE_NIMBUS): New macro.
+ * configure.ac:
+ Enable --disable-nimbus, only search for JIBX
+ and dependencies when enabled.
+
2009-05-14 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r 9f5cce422771 -r 2a131daaa86d Makefile.am
--- a/Makefile.am Thu May 14 14:08:42 2009 +0100
+++ b/Makefile.am Thu May 14 21:25:31 2009 +0100
@@ -1446,11 +1446,16 @@ ICEDTEA_ENV = \
"JAVAC=" \
"RHINO_JAR=$(RHINO_JAR)" \
"DISTRIBUTION_ID=$(DIST_ID)" \
- "ALT_JIBX_LIBS_PATH=$(abs_top_builddir)/jibx"
+ "ALT_JIBX_LIBS_PATH=$(JIBX_DEPS_DIR)"
if WITH_CACAO
ICEDTEA_ENV += \
"ALT_HOTSPOT_IMPORT_PATH=$(CACAO_IMPORT_PATH)"
+endif
+
+if !ENABLE_NIMBUS
+ICEDTEA_ENV += \
+ "DISABLE_NIMBUS=true"
endif
if !ENABLE_OPTIMIZATIONS
@@ -1524,7 +1529,7 @@ ICEDTEA_ENV_ECJ = \
"JAR_KNOWS_ATFILE=$(JAR_KNOWS_ATFILE)" \
"JAR_KNOWS_J_OPTIONS=$(JAR_KNOWS_J_OPTIONS)" \
"JAR_ACCEPTS_STDIN_LIST=$(JAR_ACCEPTS_STDIN_LIST)" \
- "ALT_JIBX_LIBS_PATH=$(abs_top_builddir)/jibx"
+ "DISABLE_NIMBUS=true"
if WITH_CACAO
ICEDTEA_ENV_ECJ += \
@@ -2881,13 +2886,13 @@ stamps/rt-class-files.stamp: rt-source-f
$(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt \
-source 1.5 \
-sourcepath \
- '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \
+ '$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \
-bootclasspath \'\' @$< ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
-source 1.5 \
-sourcepath \
- '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \
+ '$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \
-bootclasspath \'\' @$< ; \
fi
mkdir -p stamps
@@ -2926,16 +2931,16 @@ stamps/extra-class-files.stamp: extra-so
then \
$(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \
-source 1.5 \
- -sourcepath $(abs_top_srcdir)/extra \
- -bootclasspath \
- '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \
+ -sourcepath \
+ $(abs_top_srcdir)/extra:$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \
+ -bootclasspath \'\' \
@extra-source-files.txt ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
-source 1.5 \
- -sourcepath $(abs_top_srcdir)/extra \
- -bootclasspath \
- '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \
+ -sourcepath \
+ $(abs_top_srcdir)/extra:$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \
+ -bootclasspath \'\' \
@extra-source-files.txt ; \
fi
cp -r $(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources \
@@ -2959,11 +2964,14 @@ extra-lib/about.jar: stamps/extra-class-
fi
stamps/jibx.stamp: extra-lib/about.jar
- mkdir $(abs_top_builddir)/jibx
- ln -s $(BCEL_JAR) $(abs_top_builddir)/jibx
- ln -s $(XPP3_JAR) $(abs_top_builddir)/jibx
- ln -s $(JIBX_DIR)/jibx-bind.jar $(abs_top_builddir)/jibx
- ln -s $(JIBX_DIR)/jibx-run.jar $(abs_top_builddir)/jibx
+if ENABLE_NIMBUS
+ JIBX_DEPS_DIR=$(abs_top_builddir)/jibx
+ mkdir $(JIBX_DEPS_DIR)
+ ln -s $(BCEL_JAR) $(JIBX_DEPS_DIR)
+ ln -s $(XPP3_JAR) $(JIBX_DEPS_DIR)
+ ln -s $(JIBX_DIR)/jibx-bind.jar $(JIBX_DEPS_DIR)
+ ln -s $(JIBX_DIR)/jibx-run.jar $(JIBX_DEPS_DIR)
+endif
mkdir -p stamps
touch $@
diff -r 9f5cce422771 -r 2a131daaa86d acinclude.m4
--- a/acinclude.m4 Thu May 14 14:08:42 2009 +0100
+++ b/acinclude.m4 Thu May 14 21:25:31 2009 +0100
@@ -1420,3 +1420,20 @@ AC_DEFUN([FIND_JIBX_DIR],
AC_MSG_RESULT(${JIBX_DIR})
AC_SUBST(JIBX_DIR)
])
+
+AC_DEFUN([AC_CHECK_ENABLE_NIMBUS],
+[
+ AC_MSG_CHECKING(whether to build the Nimbus L'n'F)
+ AC_ARG_ENABLE([nimbus],
+ [AS_HELP_STRING(--enable-nimbus,build the Nimbus L'n'F [[default=yes]])],
+ [
+ ENABLE_NIMBUS="${enableval}"
+ ],
+ [
+ ENABLE_NIMBUS=yes
+ ])
+
+ AC_MSG_RESULT(${ENABLE_NIMBUS})
+ AM_CONDITIONAL(ENABLE_NIMBUS, test x"${ENABLE_NIMBUS}" = "xyes")
+ AC_SUBST(ENABLE_NIMBUS)
+])
diff -r 9f5cce422771 -r 2a131daaa86d configure.ac
--- a/configure.ac Thu May 14 14:08:42 2009 +0100
+++ b/configure.ac Thu May 14 21:25:31 2009 +0100
@@ -271,9 +271,6 @@ fi
fi
IT_CP39408_JAVAH
FIND_RHINO_JAR
-FIND_BCEL_JAR
-FIND_XPP3_JAR
-FIND_JIBX_DIR
WITH_OPENJDK_SRC_ZIP
WITH_HOTSPOT_SRC_ZIP
WITH_CORBA_SRC_ZIP
@@ -286,6 +283,7 @@ AC_CHECK_ENABLE_CACAO
AC_CHECK_ENABLE_CACAO
AC_CHECK_WITH_CACAO_HOME
AC_CHECK_WITH_CACAO_SRC_ZIP
+AC_CHECK_ENABLE_NIMBUS
ENABLE_OPTIMIZATIONS
SET_SHARK_BUILD
ENABLE_ZERO_BUILD
@@ -318,6 +316,13 @@ if test "x${enable_pulse_java}" = "xyes"
if test "x${enable_pulse_java}" = "xyes"
then
FIND_PULSEAUDIO
+fi
+
+if test "x${ENABLE_NIMBUS}" = "xyes"
+then
+FIND_BCEL_JAR
+FIND_XPP3_JAR
+FIND_JIBX_DIR
fi
dnl pkgconfig cannot be used to find these headers and libraries.
More information about the distro-pkg-dev
mailing list