changeset in /hg/icedtea: 2008-03-11 Lillian Angel <langel at red...
Lillian Angel
langel at redhat.com
Thu May 29 14:11:24 PDT 2008
changeset ac9c79a4b244 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ac9c79a4b244
description:
2008-03-11 Lillian Angel <langel at redhat.com>
* Makefile.am: Added check for WITH_OPENJDK.
* Makefile.in: Regenerated.
* configure: Regenerated.
* configure.ac: Added --with-openjdk and --with-openjdk-home options.
diffstat:
5 files changed, 116 insertions(+), 5 deletions(-)
ChangeLog | 7 ++++++
Makefile.am | 5 ++++
Makefile.in | 13 ++++++++---
configure | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
configure.ac | 33 ++++++++++++++++++++++++++++++
diffs (252 lines):
diff -r d4a8a58c2515 -r ac9c79a4b244 ChangeLog
--- a/ChangeLog Tue Mar 11 18:49:11 2008 +0100
+++ b/ChangeLog Tue Mar 11 15:20:01 2008 -0400
@@ -1,3 +1,10 @@ 2008-03-11 Matthias Klose <doko at ubuntu
+2008-03-11 Lillian Angel <langel at redhat.com>
+
+ * Makefile.am: Added check for WITH_OPENJDK.
+ * Makefile.in: Regenerated.
+ * configure: Regenerated.
+ * configure.ac: Added --with-openjdk and --with-openjdk-home options.
+
2008-03-11 Matthias Klose <doko at ubuntu.com>
* patches/icedtea-gcc-suffix.patch: Update, use GCC_SUFFIX in more
diff -r d4a8a58c2515 -r ac9c79a4b244 Makefile.am
--- a/Makefile.am Tue Mar 11 18:49:11 2008 +0100
+++ b/Makefile.am Tue Mar 11 15:20:01 2008 -0400
@@ -382,12 +382,17 @@ clean-bootstrap-directory:
rm -f stamps/bootstrap-directory.stamp
rm -rf bootstrap/icedtea
+if WITH_OPENJDK
+ BOOTSTRAP_DIRECTORY_STAMP =
+ ICEDTEA_HOME = $(SYSTEM_OPENJDK_DIR)
+else
if WITH_ICEDTEA
BOOTSTRAP_DIRECTORY_STAMP =
ICEDTEA_HOME = $(SYSTEM_ICEDTEA_DIR)
else
BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
ICEDTEA_HOME = icedtea
+endif
endif
# bootstrap/jdk1.6.0 to bootstrap/icedtea symlink.
diff -r d4a8a58c2515 -r ac9c79a4b244 Makefile.in
--- a/Makefile.in Tue Mar 11 18:49:11 2008 +0100
+++ b/Makefile.in Tue Mar 11 15:20:01 2008 -0400
@@ -140,7 +140,9 @@ SYSTEM_ANT_DIR = @SYSTEM_ANT_DIR@
SYSTEM_ANT_DIR = @SYSTEM_ANT_DIR@
SYSTEM_GCJ_DIR = @SYSTEM_GCJ_DIR@
SYSTEM_ICEDTEA_DIR = @SYSTEM_ICEDTEA_DIR@
+SYSTEM_OPENJDK_DIR = @SYSTEM_OPENJDK_DIR@
TAR = @TAR@
+UNZIP = @UNZIP@
VERSION = @VERSION@
WGET = @WGET@
X11_CFLAGS = @X11_CFLAGS@
@@ -158,6 +160,7 @@ XTST_LIBS = @XTST_LIBS@
XTST_LIBS = @XTST_LIBS@
XT_CFLAGS = @XT_CFLAGS@
XT_LIBS = @XT_LIBS@
+ZIP = @ZIP@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -387,10 +390,12 @@ ICEDTEA_PATCHES = \
# Patch OpenJDK for plug replacements and ecj.
ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
- at WITH_ICEDTEA_FALSE@BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
- at WITH_ICEDTEA_TRUE@BOOTSTRAP_DIRECTORY_STAMP =
- at WITH_ICEDTEA_FALSE@ICEDTEA_HOME = icedtea
- at WITH_ICEDTEA_TRUE@ICEDTEA_HOME = $(SYSTEM_ICEDTEA_DIR)
+ at WITH_ICEDTEA_FALSE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
+ at WITH_ICEDTEA_TRUE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP =
+ at WITH_OPENJDK_TRUE@BOOTSTRAP_DIRECTORY_STAMP =
+ at WITH_ICEDTEA_FALSE@@WITH_OPENJDK_FALSE at ICEDTEA_HOME = icedtea
+ at WITH_ICEDTEA_TRUE@@WITH_OPENJDK_FALSE at ICEDTEA_HOME = $(SYSTEM_ICEDTEA_DIR)
+ at WITH_OPENJDK_TRUE@ICEDTEA_HOME = $(SYSTEM_OPENJDK_DIR)
@WITH_ICEDTEA_FALSE at MEMORY_LIMIT =
# OpenJDK Targets
diff -r d4a8a58c2515 -r ac9c79a4b244 configure
--- a/configure Tue Mar 11 18:49:11 2008 +0100
+++ b/configure Tue Mar 11 15:20:01 2008 -0400
@@ -716,11 +716,14 @@ ac_ct_FASTJAR
ac_ct_FASTJAR
GAWK
SYSTEM_GCJ_DIR
+SYSTEM_OPENJDK_DIR
SYSTEM_ICEDTEA_DIR
SYSTEM_ANT_DIR
ENABLE_PLUGIN
WITH_ICEDTEA_TRUE
WITH_ICEDTEA_FALSE
+WITH_OPENJDK_TRUE
+WITH_OPENJDK_FALSE
BUILD_ARCH_DIR
INSTALL_ARCH_DIR
JAVA
@@ -1415,10 +1418,13 @@ Optional Packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-gcj-home gcj home directory (default is
/usr/lib/jvm/java-gcj)
+ --with-openjdk-home OpenJDK home directory (default is
+ /usr/lib/jvm/java-openjdk)
--with-icedtea-home IcedTea home directory (default is
/usr/lib/jvm/java-icedtea)
--with-ant-home Ant home directory (default is /usr/share/ant)
--with-icedtea build IcedTea with system-installed IcedTea
+ --with-openjdk build IcedTea with system-installed OpenJDK
--with-java specify location of the 1.5 java vm
--with-ecj bytecode compilation with ecj
--with-javac bytecode compilation with javac
@@ -5239,6 +5245,25 @@ fi
+# Check whether --with-openjdk-home was given.
+if test "${with_openjdk_home+set}" = set; then
+ withval=$with_openjdk_home;
+ if test "x${withval}" == x
+ then
+ SYSTEM_OPENJDK_DIR=/usr/lib/jvm/java-openjdk
+ else
+ SYSTEM_OPENJDK_DIR=${withval}
+ fi
+
+else
+
+ SYSTEM_OPENJDK_DIR=/usr/lib/jvm/java-openjdk
+
+fi
+
+
+
+
# Check whether --with-icedtea-home was given.
if test "${with_icedtea_home+set}" = set; then
withval=$with_icedtea_home;
@@ -5308,6 +5333,32 @@ else
else
WITH_ICEDTEA_TRUE='#'
WITH_ICEDTEA_FALSE=
+fi
+
+
+
+# Check whether --with-openjdk was given.
+if test "${with_openjdk+set}" = set; then
+ withval=$with_openjdk;
+ if test "x${withval}" != xno
+ then
+ with_openjdk=true
+ else
+ with_openjdk=false
+ fi
+
+else
+
+ with_openjdk=false
+
+fi
+
+ if test "${with_openjdk}" == true; then
+ WITH_OPENJDK_TRUE=
+ WITH_OPENJDK_FALSE='#'
+else
+ WITH_OPENJDK_TRUE='#'
+ WITH_OPENJDK_FALSE=
fi
@@ -10544,6 +10595,13 @@ if test -z "${WITH_ICEDTEA_TRUE}" && tes
{ { echo "$as_me:$LINENO: error: conditional \"WITH_ICEDTEA\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
echo "$as_me: error: conditional \"WITH_ICEDTEA\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${WITH_OPENJDK_TRUE}" && test -z "${WITH_OPENJDK_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_OPENJDK\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_OPENJDK\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -11311,11 +11369,14 @@ ac_ct_FASTJAR!$ac_ct_FASTJAR$ac_delim
ac_ct_FASTJAR!$ac_ct_FASTJAR$ac_delim
GAWK!$GAWK$ac_delim
SYSTEM_GCJ_DIR!$SYSTEM_GCJ_DIR$ac_delim
+SYSTEM_OPENJDK_DIR!$SYSTEM_OPENJDK_DIR$ac_delim
SYSTEM_ICEDTEA_DIR!$SYSTEM_ICEDTEA_DIR$ac_delim
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
+WITH_OPENJDK_TRUE!$WITH_OPENJDK_TRUE$ac_delim
+WITH_OPENJDK_FALSE!$WITH_OPENJDK_FALSE$ac_delim
BUILD_ARCH_DIR!$BUILD_ARCH_DIR$ac_delim
INSTALL_ARCH_DIR!$INSTALL_ARCH_DIR$ac_delim
JAVA!$JAVA$ac_delim
@@ -11379,7 +11440,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` = 70; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -r d4a8a58c2515 -r ac9c79a4b244 configure.ac
--- a/configure.ac Tue Mar 11 18:49:11 2008 +0100
+++ b/configure.ac Tue Mar 11 15:20:01 2008 -0400
@@ -43,6 +43,23 @@ AC_ARG_WITH([gcj-home],
])
AC_SUBST(SYSTEM_GCJ_DIR)
+AC_ARG_WITH([openjdk-home],
+ [AS_HELP_STRING([--with-openjdk-home],
+ [OpenJDK home directory \
+ (default is /usr/lib/jvm/java-openjdk)])],
+ [
+ if test "x${withval}" == x
+ then
+ SYSTEM_OPENJDK_DIR=/usr/lib/jvm/java-openjdk
+ else
+ SYSTEM_OPENJDK_DIR=${withval}
+ fi
+ ],
+ [
+ SYSTEM_OPENJDK_DIR=/usr/lib/jvm/java-openjdk
+ ])
+AC_SUBST(SYSTEM_OPENJDK_DIR)
+
AC_ARG_WITH([icedtea-home],
[AS_HELP_STRING([--with-icedtea-home],
[IcedTea home directory \
@@ -97,6 +114,22 @@ AC_ARG_WITH([icedtea],
with_icedtea=false
])
AM_CONDITIONAL(WITH_ICEDTEA, test "${with_icedtea}" == true)
+
+AC_ARG_WITH([openjdk],
+ [AS_HELP_STRING([--with-openjdk],
+ [build IcedTea with system-installed OpenJDK])],
+ [
+ if test "x${withval}" != xno
+ then
+ with_openjdk=true
+ else
+ with_openjdk=false
+ fi
+ ],
+ [
+ with_openjdk=false
+ ])
+AM_CONDITIONAL(WITH_OPENJDK, test "${with_openjdk}" == true)
SET_ARCH_DIRS
if test "${with_icedtea}" == true
More information about the distro-pkg-dev
mailing list