Mercurial > hg > release > icedtea6-1.3

changeset 758:b09b79ff309b cacao

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2008-03-11 Lillian Angel <langel@redhat.com> * Makefile.am: Added check for WITH_OPENJDK. * Makefile.in: Regenerated. * configure: Regenerated. * configure.ac: Added --with-openjdk and --with-openjdk-home options.
author Lillian Angel <langel@redhat.com>
date Tue, 11 Mar 2008 15:20:01 -0400
parents 47561b02c0e7
children 04d4904dc002
files ChangeLog Makefile.am Makefile.in configure configure.ac
diffstat 5 files changed, 110 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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  Lillian Angel  <langel@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@ubuntu.com>
 
 	* patches/icedtea-gcc-suffix.patch: Update, use GCC_SUFFIX in more
--- a/Makefile.am	Tue Mar 11 18:49:11 2008 +0100
+++ b/Makefile.am	Tue Mar 11 15:20:01 2008 -0400
@@ -397,6 +397,10 @@
 	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)
@@ -404,6 +408,7 @@
   BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
   ICEDTEA_HOME = icedtea
 endif
+endif
 
 # bootstrap/jdk1.6.0 to bootstrap/icedtea symlink.
 stamps/bootstrap-directory-symlink.stamp: $(BOOTSTRAP_DIRECTORY_STAMP)
--- a/Makefile.in	Tue Mar 11 18:49:11 2008 +0100
+++ b/Makefile.in	Tue Mar 11 15:20:01 2008 -0400
@@ -150,7 +150,9 @@
 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@
@@ -168,6 +170,7 @@
 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@
--- 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
 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
@@ -1418,10 +1421,13 @@
   --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
@@ -5243,6 +5249,25 @@
 
 
 
+# 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;
@@ -5316,6 +5341,32 @@
 
 
 
+# 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
+
+
+
   case "${host}" in
     x86_64-*-*)
       BUILD_ARCH_DIR=amd64
@@ -10589,6 +10640,13 @@
 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
 if test -z "${GCC_OLD_TRUE}" && test -z "${GCC_OLD_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"GCC_OLD\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -11360,11 +11418,14 @@
 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
@@ -11431,7 +11492,7 @@
 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
--- 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_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 \
@@ -98,6 +115,22 @@
         ])
 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
 then