changeset in /hg/icedtea6: 2008-04-08 Andrew John Hughes <gnu_...
gnu_andrew at member.fsf.org
gnu_andrew at member.fsf.org
Tue Apr 8 00:55:49 PDT 2008
changeset ff3d152968b5 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ff3d152968b5
description:
2008-04-08 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am: Add NO_DOCS option as
appropriate to ICEDTEA_ENV and ICEDTEA_ENV_ECJ
* Makefile.in: Regenerated.
* configure: Likewise.
* configure.ac: Add --disable-docs option.
diffstat:
5 files changed, 64 insertions(+), 6 deletions(-)
ChangeLog | 8 ++++++++
Makefile.am | 10 ++++++++++
Makefile.in | 16 +++++++++++-----
configure | 30 +++++++++++++++++++++++++++++-
configure.ac | 6 ++++++
diffs (182 lines):
diff -r 0c0add06bfb7 -r ff3d152968b5 ChangeLog
--- a/ChangeLog Mon Apr 07 13:06:27 2008 -0400
+++ b/ChangeLog Tue Apr 08 08:55:33 2008 +0100
@@ -1,3 +1,11 @@ 2008-04-07 Joshua Sumali <jsumali at redh
+2008-04-08 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * Makefile.am: Add NO_DOCS option as
+ appropriate to ICEDTEA_ENV and ICEDTEA_ENV_ECJ
+ * Makefile.in: Regenerated.
+ * configure: Likewise.
+ * configure.ac: Add --disable-docs option.
+
2008-04-07 Joshua Sumali <jsumali at redhat.com>
* patches/icedtea-netx-plugin.patch: Removed reflection hunk.
diff -r 0c0add06bfb7 -r ff3d152968b5 Makefile.am
--- a/Makefile.am Mon Apr 07 13:06:27 2008 -0400
+++ b/Makefile.am Tue Apr 08 08:55:33 2008 +0100
@@ -102,6 +102,11 @@ if WITH_CACAO
if WITH_CACAO
ICEDTEA_ENV += \
"ALT_HOTSPOT_IMPORT_PATH=$(CACAO)"
+endif
+
+if !ENABLE_DOCS
+ICEDTEA_ENV += \
+ "NO_DOCS=true"
endif
env:
@@ -152,6 +157,11 @@ if WITH_CACAO
if WITH_CACAO
ICEDTEA_ENV_ECJ += \
"ALT_HOTSPOT_IMPORT_PATH=$(CACAO)"
+endif
+
+if !ENABLE_DOCS
+ICEDTEA_ENV_ECJ += \
+ "NO_DOCS=true"
endif
env-ecj:
diff -r 0c0add06bfb7 -r ff3d152968b5 Makefile.in
--- a/Makefile.in Mon Apr 07 13:06:27 2008 -0400
+++ b/Makefile.in Tue Apr 08 08:55:33 2008 +0100
@@ -34,10 +34,16 @@ host_triplet = @host@
@WITH_CACAO_TRUE at am__append_1 = \
@WITH_CACAO_TRUE@ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)"
- at WITH_CACAO_TRUE@am__append_2 = \
+ at ENABLE_DOCS_FALSE@am__append_2 = \
+ at ENABLE_DOCS_FALSE@ "NO_DOCS=true"
+
+ at WITH_CACAO_TRUE@am__append_3 = \
@WITH_CACAO_TRUE@ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)"
- at WITH_CACAO_TRUE@am__append_3 = \
+ at ENABLE_DOCS_FALSE@am__append_4 = \
+ at ENABLE_DOCS_FALSE@ "NO_DOCS=true"
+
+ at WITH_CACAO_TRUE@am__append_5 = \
@WITH_CACAO_TRUE@ patches/icedtea-cacao.patch
subdir = .
@@ -289,7 +295,7 @@ ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICE
"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
- "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_1)
+ "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_1) $(am__append_2)
# OpenJDK ecj build environment.
ICEDTEA_BUILD_DIR_ECJ = \
@@ -326,7 +332,7 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$
"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
- "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_2)
+ "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_3) $(am__append_4)
# OpenJDK Source Preparation Targets
# ==================================
@@ -387,7 +393,7 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
patches/icedtea-print-lsb-release.patch \
patches/icedtea-jpegclasses.patch \
patches/icedtea-arm-uname.patch $(GCC_PATCH) \
- $(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_3)
+ $(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_5)
# Patch OpenJDK for plug replacements and ecj.
ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
diff -r 0c0add06bfb7 -r ff3d152968b5 configure
--- a/configure Mon Apr 07 13:06:27 2008 -0400
+++ b/configure Tue Apr 08 08:55:33 2008 +0100
@@ -722,6 +722,8 @@ SYSTEM_ICEDTEA_DIR
SYSTEM_ICEDTEA_DIR
SYSTEM_ANT_DIR
ENABLE_PLUGIN
+ENABLE_DOCS_TRUE
+ENABLE_DOCS_FALSE
WITH_ICEDTEA_TRUE
WITH_ICEDTEA_FALSE
WITH_OPENJDK_TRUE
@@ -1417,6 +1419,7 @@ Optional Features:
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--disable-gcjwebplugin Disable compilation of browser plugin
+ --disable-docs Disable generation of documentation
--enable-fast-build optimize for quick building: use -O0 and do not
build documentation
--enable-zero use zero-assembler port on non-zero platforms
@@ -5539,6 +5542,22 @@ fi
+# Check whether --enable-docs was given.
+if test "${enable_docs+set}" = set; then
+ enableval=$enable_docs; ENABLE_DOCS="$val"
+else
+ ENABLE_DOCS='yes'
+fi
+
+ if test x$ENABLE_DOCS = xyes; then
+ ENABLE_DOCS_TRUE=
+ ENABLE_DOCS_FALSE='#'
+else
+ ENABLE_DOCS_TRUE='#'
+ ENABLE_DOCS_FALSE=
+fi
+
+
# Check whether --with-icedtea was given.
if test "${with_icedtea+set}" = set; then
@@ -11777,6 +11796,13 @@ if test -z "${am__fastdepCXX_TRUE}" && t
{ { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${ENABLE_DOCS_TRUE}" && test -z "${ENABLE_DOCS_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_DOCS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"ENABLE_DOCS\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -12560,6 +12586,8 @@ SYSTEM_ICEDTEA_DIR!$SYSTEM_ICEDTEA_DIR$a
SYSTEM_ICEDTEA_DIR!$SYSTEM_ICEDTEA_DIR$ac_delim
SYSTEM_ANT_DIR!$SYSTEM_ANT_DIR$ac_delim
ENABLE_PLUGIN!$ENABLE_PLUGIN$ac_delim
+ENABLE_DOCS_TRUE!$ENABLE_DOCS_TRUE$ac_delim
+ENABLE_DOCS_FALSE!$ENABLE_DOCS_FALSE$ac_delim
WITH_ICEDTEA_TRUE!$WITH_ICEDTEA_TRUE$ac_delim
WITH_ICEDTEA_FALSE!$WITH_ICEDTEA_FALSE$ac_delim
WITH_OPENJDK_TRUE!$WITH_OPENJDK_TRUE$ac_delim
@@ -12635,7 +12663,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` = 83; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -r 0c0add06bfb7 -r ff3d152968b5 configure.ac
--- a/configure.ac Mon Apr 07 13:06:27 2008 -0400
+++ b/configure.ac Tue Apr 08 08:55:33 2008 +0100
@@ -100,6 +100,12 @@ AC_ARG_ENABLE([gcjwebplugin],
[Disable compilation of browser plugin])],
[ENABLE_PLUGIN="$val"], [ENABLE_PLUGIN='yes'])
AC_SUBST(ENABLE_PLUGIN)
+
+AC_ARG_ENABLE([docs],
+ [AS_HELP_STRING([--disable-docs],
+ [Disable generation of documentation])],
+ [ENABLE_DOCS="$val"], [ENABLE_DOCS='yes'])
+AM_CONDITIONAL([ENABLE_DOCS], [test x$ENABLE_DOCS = xyes])
AC_ARG_WITH([icedtea],
[AS_HELP_STRING([--with-icedtea],
More information about the distro-pkg-dev
mailing list