Mercurial > hg > release > icedtea6-1.12

changeset 38:7c9a7262cc1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2007-06-22 Francis Kung <fkung@redhat.com> * Makefile.am: Specify default openjdk zip file. * acinclude.m4: Remove openjdk zip file name constant. * Makefile.in: Regenerated. * configure: Likewise.
author Francis Kung <fkung@redhat.com>
date Fri, 22 Jun 2007 10:44:31 -0400
parents 354afcde883b
children f5688ce69fe4
files ChangeLog Makefile.am Makefile.in acinclude.m4 configure
diffstat 5 files changed, 69 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Jun 22 09:35:32 2007 -0400
+++ b/ChangeLog	Fri Jun 22 10:44:31 2007 -0400
@@ -1,3 +1,10 @@
+2007-06-22  Francis Kung  <fkung@redhat.com>
+
+	* Makefile.am: Specify default openjdk zip file.
+	* acinclude.m4: Remove openjdk zip file name constant.
+	* Makefile.in: Regenerated.
+	* configure: Likewise.
+
 2007-06-22  Gary Benson  <gbenson@redhat.com>
 
 	* icedtea-ports.patch: Update.
--- a/Makefile.am	Fri Jun 22 09:35:32 2007 -0400
+++ b/Makefile.am	Fri Jun 22 10:44:31 2007 -0400
@@ -16,6 +16,11 @@
   FAST_BUILD_PATCH =
 endif
 
+if USE_ALT_OPENJDK_SRC_ZIP
+  OPENJDK_SRC_ZIP=$(ALT_OPENJDK_SRC_ZIP)
+else
+  OPENJDK_SRC_ZIP=openjdk-7-ea-src-b13-24_may_2007.zip
+endif
 
 ICEDTEA_PATCHES = \
 	patches/icedtea-copy-plugs.patch \
--- a/Makefile.in	Fri Jun 22 09:35:32 2007 -0400
+++ b/Makefile.in	Fri Jun 22 10:44:31 2007 -0400
@@ -59,6 +59,7 @@
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
+ALT_OPENJDK_SRC_ZIP = @ALT_OPENJDK_SRC_ZIP@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -103,7 +104,6 @@
 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@
@@ -174,11 +174,13 @@
 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_MD5SUM = 9e6b27b7c1d7fee4bf149c7dea33517d
+OPENJDK_MD5SUM = c126a32966e4bdb6a60a5724d9447966
 @USE_CCACHE_FALSE@CCACHE_PATCH = 
 @USE_CCACHE_TRUE@CCACHE_PATCH = patches/icedtea-ccache.patch
 @FAST_BUILD_FALSE@FAST_BUILD_PATCH = 
 @FAST_BUILD_TRUE@FAST_BUILD_PATCH = patches/icedtea-speed.patch
+@USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-7-ea-src-b14-21_jun_2007.zip
+@USE_ALT_OPENJDK_SRC_ZIP_TRUE@OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
 ICEDTEA_PATCHES = \
 	patches/icedtea-copy-plugs.patch \
 	patches/icedtea-lesstif.patch \
--- a/acinclude.m4	Fri Jun 22 09:35:32 2007 -0400
+++ b/acinclude.m4	Fri Jun 22 10:44:31 2007 -0400
@@ -337,13 +337,15 @@
   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}
+    ALT_OPENJDK_SRC_ZIP=${withval}
+    AM_CONDITIONAL(USE_ALT_OPENJDK_SRC_ZIP, test x = x)
   ],
   [ 
-    OPENJDK_SRC_ZIP=openjdk-7-ea-src-b13-24_may_2007.zip
+    ALT_OPENJDK_SRC_ZIP="not specified"
+    AM_CONDITIONAL(USE_ALT_OPENJDK_SRC_ZIP, test x != x)
   ])
-  AC_MSG_RESULT(${OPENJDK_SRC_ZIP})
-  AC_SUBST(OPENJDK_SRC_ZIP)
+  AC_MSG_RESULT(${ALT_OPENJDK_SRC_ZIP})
+  AC_SUBST(ALT_OPENJDK_SRC_ZIP)
 ])
 
 AC_DEFUN([FIND_XALAN2_JAR],
--- a/configure	Fri Jun 22 09:35:32 2007 -0400
+++ b/configure	Fri Jun 22 10:44:31 2007 -0400
@@ -721,7 +721,9 @@
 XALAN2_JAR
 XALAN2_SERIALIZER_JAR
 XERCES2_JAR
-OPENJDK_SRC_ZIP
+USE_ALT_OPENJDK_SRC_ZIP_TRUE
+USE_ALT_OPENJDK_SRC_ZIP_FALSE
+ALT_OPENJDK_SRC_ZIP
 OPENJDK_SRC_DIR
 GNU_CLASSLIB_FOUND_TRUE
 GNU_CLASSLIB_FOUND_FALSE
@@ -5304,16 +5306,32 @@
 # 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; }
+    ALT_OPENJDK_SRC_ZIP=${withval}
+     if test x = x; then
+  USE_ALT_OPENJDK_SRC_ZIP_TRUE=
+  USE_ALT_OPENJDK_SRC_ZIP_FALSE='#'
+else
+  USE_ALT_OPENJDK_SRC_ZIP_TRUE='#'
+  USE_ALT_OPENJDK_SRC_ZIP_FALSE=
+fi
+
+
+else
+
+    ALT_OPENJDK_SRC_ZIP="not specified"
+     if test x != x; then
+  USE_ALT_OPENJDK_SRC_ZIP_TRUE=
+  USE_ALT_OPENJDK_SRC_ZIP_FALSE='#'
+else
+  USE_ALT_OPENJDK_SRC_ZIP_TRUE='#'
+  USE_ALT_OPENJDK_SRC_ZIP_FALSE=
+fi
+
+
+fi
+
+  { echo "$as_me:$LINENO: result: ${ALT_OPENJDK_SRC_ZIP}" >&5
+echo "${ECHO_T}${ALT_OPENJDK_SRC_ZIP}" >&6; }
 
 
 
@@ -7184,6 +7202,20 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${USE_ALT_OPENJDK_SRC_ZIP_TRUE}" && test -z "${USE_ALT_OPENJDK_SRC_ZIP_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"USE_ALT_OPENJDK_SRC_ZIP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_ALT_OPENJDK_SRC_ZIP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${USE_ALT_OPENJDK_SRC_ZIP_TRUE}" && test -z "${USE_ALT_OPENJDK_SRC_ZIP_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"USE_ALT_OPENJDK_SRC_ZIP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_ALT_OPENJDK_SRC_ZIP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${GNU_CLASSLIB_FOUND_TRUE}" && test -z "${GNU_CLASSLIB_FOUND_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"GNU_CLASSLIB_FOUND\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -7876,7 +7908,9 @@
 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
+USE_ALT_OPENJDK_SRC_ZIP_TRUE!$USE_ALT_OPENJDK_SRC_ZIP_TRUE$ac_delim
+USE_ALT_OPENJDK_SRC_ZIP_FALSE!$USE_ALT_OPENJDK_SRC_ZIP_FALSE$ac_delim
+ALT_OPENJDK_SRC_ZIP!$ALT_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
@@ -7892,7 +7926,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 25; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5