Mercurial > hg > release > icedtea6-1.12

changeset 26:d149c2933e63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2007-06-18 Lillian Angel <langel@redhat.com> * Makefile.am: Removed OPENJDK_SRC_ZIP. * Makefile.in: Regenerated. * acinclude.m4: Added with-openjdk-src-zip option * configure: Regenerated. * configure.ac: Added new function.
author Lillian Angel <langel@redhat.com>
date Mon, 18 Jun 2007 13:10:29 -0400
parents e19c20030ba4
children d0d8adc66035
files ChangeLog Makefile.am Makefile.in acinclude.m4 configure configure.ac
diffstat 6 files changed, 48 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jun 18 12:52:52 2007 -0400
+++ b/ChangeLog	Mon Jun 18 13:10:29 2007 -0400
@@ -1,3 +1,11 @@
+2007-06-18  Lillian Angel  <langel@redhat.com>
+
+	* Makefile.am: Removed OPENJDK_SRC_ZIP.
+	* Makefile.in: Regenerated.
+	* acinclude.m4: Added with-openjdk-src-zip option
+	* configure: Regenerated.
+	* configure.ac: Added new function.
+
 2007-06-18  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* Makefile.am (ICEDTEA_PATCHES): Add
--- a/Makefile.am	Mon Jun 18 12:52:52 2007 -0400
+++ b/Makefile.am	Mon Jun 18 13:10:29 2007 -0400
@@ -2,8 +2,6 @@
 
 OPENJDK_URL = http://www.java.net/download/openjdk/40ec4ed263a6dfce13b8cf18fa046058/jdk7/promoted/b13/
 
-OPENJDK_SRC_ZIP = openjdk-7-ea-src-b13-24_may_2007.zip
-
 OPENJDK_MD5SUM = 9e6b27b7c1d7fee4bf149c7dea33517d
 
 ICEDTEA_PATCHES = \
--- a/Makefile.in	Mon Jun 18 12:52:52 2007 -0400
+++ b/Makefile.in	Mon Jun 18 13:10:29 2007 -0400
@@ -102,6 +102,7 @@
 MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 OPENJDK_SRC_DIR = @OPENJDK_SRC_DIR@
+OPENJDK_SRC_ZIP = @OPENJDK_SRC_ZIP@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -172,7 +173,6 @@
 top_srcdir = @top_srcdir@
 EXTRA_DIST = rt jce generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH)
 OPENJDK_URL = http://www.java.net/download/openjdk/40ec4ed263a6dfce13b8cf18fa046058/jdk7/promoted/b13/
-OPENJDK_SRC_ZIP = openjdk-7-ea-src-b13-24_may_2007.zip
 OPENJDK_MD5SUM = 9e6b27b7c1d7fee4bf149c7dea33517d
 ICEDTEA_PATCHES = \
 	patches/icedtea-copy-plugs.patch \
--- a/acinclude.m4	Mon Jun 18 12:52:52 2007 -0400
+++ b/acinclude.m4	Mon Jun 18 13:10:29 2007 -0400
@@ -331,6 +331,21 @@
   AC_SUBST(ENDORSED_JARS)
 ])
 
+AC_DEFUN([WITH_OPENJDK_SRC_ZIP],
+[
+  AC_MSG_CHECKING(openjdk source zip)
+  AC_ARG_WITH([openjdk-src-zip],
+              [AS_HELP_STRING(--with-openjdk-src-zip,specify the location of the openjdk source zip)],
+  [
+    OPENJDK_SRC_ZIP=${withval}
+  ],
+  [ 
+    OPENJDK_SRC_ZIP=openjdk-7-ea-src-b13-24_may_2007.zip
+  ])
+  AC_MSG_RESULT(${OPENJDK_SRC_ZIP})
+  AC_SUBST(OPENJDK_SRC_ZIP)
+])
+
 AC_DEFUN([FIND_XALAN2_JAR],
 [
   AC_ARG_WITH([xalan2-jar],
--- a/configure	Mon Jun 18 12:52:52 2007 -0400
+++ b/configure	Mon Jun 18 13:10:29 2007 -0400
@@ -721,6 +721,7 @@
 XALAN2_JAR
 XALAN2_SERIALIZER_JAR
 XERCES2_JAR
+OPENJDK_SRC_ZIP
 OPENJDK_SRC_DIR
 GNU_CLASSLIB_FOUND_TRUE
 GNU_CLASSLIB_FOUND_FALSE
@@ -1336,6 +1337,7 @@
   --with-xalan2-serializer-jar
                           specify location of the xalan2-serializer jar
   --with-xerces2-jar      specify location of the xerces2 jar
+  --with-openjdk-src-zip  specify the location of the openjdk source zip
   --with-openjdk-src-dir  specify the location of the openjdk sources
 
 Some influential environment variables:
@@ -5288,6 +5290,25 @@
 
 
 
+  { echo "$as_me:$LINENO: checking openjdk source zip" >&5
+echo $ECHO_N "checking openjdk source zip... $ECHO_C" >&6; }
+
+# Check whether --with-openjdk-src-zip was given.
+if test "${with_openjdk_src_zip+set}" = set; then
+  withval=$with_openjdk_src_zip;
+    OPENJDK_SRC_ZIP=${withval}
+
+else
+
+    OPENJDK_SRC_ZIP=openjdk-7-ea-src-b13-24_may_2007.zip
+
+fi
+
+  { echo "$as_me:$LINENO: result: ${OPENJDK_SRC_ZIP}" >&5
+echo "${ECHO_T}${OPENJDK_SRC_ZIP}" >&6; }
+
+
+
   { echo "$as_me:$LINENO: checking openjdk sources" >&5
 echo $ECHO_N "checking openjdk sources... $ECHO_C" >&6; }
 
@@ -7699,6 +7720,7 @@
 XALAN2_JAR!$XALAN2_JAR$ac_delim
 XALAN2_SERIALIZER_JAR!$XALAN2_SERIALIZER_JAR$ac_delim
 XERCES2_JAR!$XERCES2_JAR$ac_delim
+OPENJDK_SRC_ZIP!$OPENJDK_SRC_ZIP$ac_delim
 OPENJDK_SRC_DIR!$OPENJDK_SRC_DIR$ac_delim
 GNU_CLASSLIB_FOUND_TRUE!$GNU_CLASSLIB_FOUND_TRUE$ac_delim
 GNU_CLASSLIB_FOUND_FALSE!$GNU_CLASSLIB_FOUND_FALSE$ac_delim
@@ -7709,7 +7731,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- a/configure.ac	Mon Jun 18 12:52:52 2007 -0400
+++ b/configure.ac	Mon Jun 18 13:10:29 2007 -0400
@@ -32,6 +32,7 @@
 FIND_XALAN2_JAR
 FIND_XALAN2_SERIALIZER_JAR
 FIND_XERCES2_JAR
+WITH_OPENJDK_SRC_ZIP
 WITH_OPENJDK_SRC_DIR
 
 CHECK_HEADERS