Mercurial > hg > release > icedtea6-1.12

changeset 8:123c2340f9cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2007-06-07 Francis Kung <fkung@redhat.com> * acinclude.m4: Add explicit xalan/xerces checks. * configure.ac: Likewise. * Makefile.am: Use explicit xalan/xerces locations; use dummy file when creating empty jars. * Makefile.in: Regenerated. * configure: Likewise.
author Francis Kung <fkung@redhat.com>
date Thu, 07 Jun 2007 19:21:19 -0400
parents d09e46408f93
children 3ee6d78cabc7
files ChangeLog Makefile.am Makefile.in acinclude.m4 configure configure.ac
diffstat 6 files changed, 251 insertions(+), 49 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jun 07 12:14:52 2007 -0400
+++ b/ChangeLog	Thu Jun 07 19:21:19 2007 -0400
@@ -1,3 +1,12 @@
+2007-06-07  Francis Kung  <fkung@redhat.com>
+
+	* acinclude.m4: Add explicit xalan/xerces checks.
+	* configure.ac: Likewise.
+	* Makefile.am: Use explicit xalan/xerces locations;
+	use dummy file when creating empty jars.
+	* Makefile.in: Regenerated.
+	* configure: Likewise.
+
 2007-06-07  Francis Kung  <fkung@redhat.com>
 
 	* acinclude.m4: Cleaned up header checks.
--- a/Makefile.am	Thu Jun 07 12:14:52 2007 -0400
+++ b/Makefile.am	Thu Jun 07 19:21:19 2007 -0400
@@ -282,7 +282,9 @@
 	ln -sf $(JAR) bootstrap/jdk1.6.0/bin/jar
 	cp -f javac bootstrap/jdk1.6.0/bin/javac
 	cp -f javap bootstrap/jdk1.6.0/bin/javap
-	ln -sf $(ENDORSED_JARS) bootstrap/jdk1.6.0/lib/endorsed
+	ln -sf $(XALAN2_JAR) bootstrap/jdk1.6.0/lib/endorsed/xalan-j2.jar
+	ln -sf $(XALAN2_SERIALIZER_JAR) bootstrap/jdk1.6.0/lib/endorsed/xalan-j2-serializer.jar
+	ln -sf $(XERCES2_JAR) bootstrap/jdk1.6.0/lib/endorsed/xerces-j2.jar
 
 icedteaboot: all unboot
 	cp -a openjdk/control/build/linux-$(BUILD_ARCH_DIR)/j2sdk-image \
@@ -300,10 +302,12 @@
 	    -Wl,-soname,libjawt.so -xc - ; \
 	done
 	mkdir -p bootstrap/jdk1.7.0/jre/lib/ext
-	$(JAR) cf bootstrap/jdk1.7.0/jre/lib/ext/sunjce_provider.jar
+	touch empty_file
+	$(JAR) cf bootstrap/jdk1.7.0/jre/lib/ext/sunjce_provider.jar empty_file
 	mkdir -p bootstrap/jdk1.7.0/jre/lib/security
-	$(JAR) cf bootstrap/jdk1.7.0/jre/lib/security/local_policy.jar
-	$(JAR) cf bootstrap/jdk1.7.0/jre/lib/security/US_export_policy.jar
+	$(JAR) cf bootstrap/jdk1.7.0/jre/lib/security/local_policy.jar empty_file
+	$(JAR) cf bootstrap/jdk1.7.0/jre/lib/security/US_export_policy.jar empty_file
+	rm empty_file
 	cp -f lib/rt/rt.jar bootstrap/jdk1.7.0/jre/lib
 	cp -f lib/jce/jce.jar bootstrap/jdk1.7.0/jre/lib
 
--- a/Makefile.in	Thu Jun 07 12:14:52 2007 -0400
+++ b/Makefile.in	Thu Jun 07 19:21:19 2007 -0400
@@ -79,7 +79,6 @@
 ECJ = @ECJ@
 ECJ_JAR = @ECJ_JAR@
 EGREP = @EGREP@
-ENDORSED_JARS = @ENDORSED_JARS@
 EXEEXT = @EXEEXT@
 FIND = @FIND@
 GREP = @GREP@
@@ -118,6 +117,9 @@
 UNZIP = @UNZIP@
 VERSION = @VERSION@
 WGET = @WGET@
+XALAN2_JAR = @XALAN2_JAR@
+XALAN2_SERIALIZER_JAR = @XALAN2_SERIALIZER_JAR@
+XERCES2_JAR = @XERCES2_JAR@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -716,7 +718,9 @@
 	ln -sf $(JAR) bootstrap/jdk1.6.0/bin/jar
 	cp -f javac bootstrap/jdk1.6.0/bin/javac
 	cp -f javap bootstrap/jdk1.6.0/bin/javap
-	ln -sf $(ENDORSED_JARS) bootstrap/jdk1.6.0/lib/endorsed
+	ln -sf $(XALAN2_JAR) bootstrap/jdk1.6.0/lib/endorsed/xalan-j2.jar
+	ln -sf $(XALAN2_SERIALIZER_JAR) bootstrap/jdk1.6.0/lib/endorsed/xalan-j2-serializer.jar
+	ln -sf $(XERCES2_JAR) bootstrap/jdk1.6.0/lib/endorsed/xerces-j2.jar
 
 icedteaboot: all unboot
 	cp -a openjdk/control/build/linux-$(BUILD_ARCH_DIR)/j2sdk-image \
@@ -734,10 +738,12 @@
 	    -Wl,-soname,libjawt.so -xc - ; \
 	done
 	mkdir -p bootstrap/jdk1.7.0/jre/lib/ext
-	$(JAR) cf bootstrap/jdk1.7.0/jre/lib/ext/sunjce_provider.jar
+	touch empty_file
+	$(JAR) cf bootstrap/jdk1.7.0/jre/lib/ext/sunjce_provider.jar empty_file
 	mkdir -p bootstrap/jdk1.7.0/jre/lib/security
-	$(JAR) cf bootstrap/jdk1.7.0/jre/lib/security/local_policy.jar
-	$(JAR) cf bootstrap/jdk1.7.0/jre/lib/security/US_export_policy.jar
+	$(JAR) cf bootstrap/jdk1.7.0/jre/lib/security/local_policy.jar empty_file
+	$(JAR) cf bootstrap/jdk1.7.0/jre/lib/security/US_export_policy.jar empty_file
+	rm empty_file
 	cp -f lib/rt/rt.jar bootstrap/jdk1.7.0/jre/lib
 	cp -f lib/jce/jce.jar bootstrap/jdk1.7.0/jre/lib
 
--- a/acinclude.m4	Thu Jun 07 12:14:52 2007 -0400
+++ b/acinclude.m4	Thu Jun 07 19:21:19 2007 -0400
@@ -327,6 +327,102 @@
   AC_SUBST(ENDORSED_JARS)
 ])
 
+AC_DEFUN([FIND_XALAN2_JAR],
+[
+  AC_ARG_WITH([xalan2-jar],
+              [AS_HELP_STRING(--with-xalan2-jar,specify location of the xalan2 jar)],
+  [
+    if test -f "${withval}"; then
+      AC_MSG_CHECKING(xalan2 jar)
+      XALAN2_JAR="${withval}"
+      AC_MSG_RESULT(${withval})
+    fi
+  ],
+  [
+    XALAN2_JAR=
+  ])
+  if test -z "${XALAN2_JAR}"; then
+    AC_MSG_CHECKING(for xalan2 jar)
+    if test -e "/usr/share/java/xalan-j2.jar"; then
+      XALAN2_JAR=/usr/share/java/xalan-j2.jar
+      AC_MSG_RESULT(${XALAN2_JAR})
+    elif test -e "/usr/share/java/xalan2.jar"; then
+      XALAN2_JAR=/usr/share/java/xalan2.jar
+      AC_MSG_RESULT(${XALAN2_JAR})
+    else
+      AC_MSG_RESULT(no)
+    fi
+  fi
+  if test -z "${XALAN2_JAR}"; then
+    AC_MSG_ERROR("A xalan2 jar was not found.")
+  fi
+  AC_SUBST(XALAN2_JAR)
+])
+
+AC_DEFUN([FIND_XALAN2_SERIALIZER_JAR],
+[
+  AC_ARG_WITH([xalan2-serializer-jar],
+              [AS_HELP_STRING(--with-xalan2-serializer-jar,specify location of the xalan2-serializer jar)],
+  [
+    if test -f "${withval}"; then
+      AC_MSG_CHECKING(xalan2 serializer jar)
+      XALAN2_SERIALIZER_JAR="${withval}"
+      AC_MSG_RESULT(${withval})
+    fi
+  ],
+  [
+    XALAN2_SERIALIZER_JAR=
+  ])
+  if test -z "${XALAN2_SERIALIZER_JAR}"; then
+    AC_MSG_CHECKING(for xalan2-serializer jar)
+    if test -e "/usr/share/java/xalan-j2-serializer.jar"; then
+      XALAN2_SERIALIZER_JAR=/usr/share/java/xalan-j2-serializer.jar
+      AC_MSG_RESULT(${XALAN2_SERIALIZER_JAR})
+    elif test -e "/usr/share/java/xalan2.jar"; then
+      XALAN2_SERIALIZER_JAR=/usr/share/java/xalan2.jar
+      AC_MSG_RESULT(${XALAN2_SERIALIZER_JAR})
+    else
+      AC_MSG_RESULT(no)
+    fi
+  fi
+  if test -z "${XALAN2_SERIALIZER_JAR}"; then
+    AC_MSG_ERROR("A xalan2-serializer jar was not found.")
+  fi
+  AC_SUBST(XALAN2_SERIALIZER_JAR)
+])
+
+AC_DEFUN([FIND_XERCES2_JAR],
+[
+  AC_ARG_WITH([xerces2-jar],
+              [AS_HELP_STRING(--with-xerces2-jar,specify location of the xerces2 jar)],
+  [
+    if test -f "${withval}"; then
+      AC_MSG_CHECKING(xerces2 jar)
+      XERCES2_JAR="${withval}"
+      AC_MSG_RESULT(${withval})
+    fi
+  ],
+  [
+    XERCES2_JAR=
+  ])
+  if test -z "${XERCES2_JAR}"; then
+    AC_MSG_CHECKING(for xerces2 jar)
+    if test -e "/usr/share/java/xerces-j2.jar"; then
+      XERCES2_JAR=/usr/share/java/xerces-j2.jar
+      AC_MSG_RESULT(${XERCES2_JAR})
+    elif test -e "/usr/share/java/xerces2.jar"; then
+      XERCES2_JAR=/usr/share/java/xerces2.jar
+      AC_MSG_RESULT(${XERCES2_JAR})
+    else
+      AC_MSG_RESULT(no)
+    fi
+  fi
+  if test -z "${XERCES2_JAR}"; then
+    AC_MSG_ERROR("A xerces2 jar was not found.")
+  fi
+  AC_SUBST(XERCES2_JAR)
+])
+
 AC_DEFUN([CHECK_HEADERS],
 [
   AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[],[AC_MSG_ERROR("CUPS headers were not found - try installing cups-devel.")])
--- a/configure	Thu Jun 07 12:14:52 2007 -0400
+++ b/configure	Thu Jun 07 19:21:19 2007 -0400
@@ -718,7 +718,9 @@
 RMIC
 ECJ_JAR
 LIBGCJ_JAR
-ENDORSED_JARS
+XALAN2_JAR
+XALAN2_SERIALIZER_JAR
+XERCES2_JAR
 OPENJDK_SRC_DIR
 GNU_CLASSLIB_FOUND_TRUE
 GNU_CLASSLIB_FOUND_FALSE
@@ -1330,8 +1332,10 @@
   --with-rmic             specify location of the rmic
   --with-ecj-jar          specify location of the ECJ jar
   --with-libgcj-jar       specify location of the libgcj jar
-  --with-endorsed-dir     specify directory of endorsed jars (xalan-j2.jar,
-                          xalan-j2-serializer.jar, xerces-j2.jar)
+  --with-xalan2-jar       specify location of the xalan2 jar
+  --with-xalan2-serializer-jar
+                          specify location of the xalan2-serializer jar
+  --with-xerces2-jar      specify location of the xerces2 jar
   --with-openjdk-src-dir  specify the location of the openjdk sources
 
 Some influential environment variables:
@@ -5155,47 +5159,126 @@
 
 
 
-# Check whether --with-endorsed-dir was given.
-if test "${with_endorsed_dir+set}" = set; then
-  withval=$with_endorsed_dir;
-    if test -f "${withval}/xalan-j2.jar"; then
-      if test -f "${withval}/xalan-j2-serializer.jar"; then
-        if test -f "${withval}/xerces-j2.jar"; then
-          { echo "$as_me:$LINENO: checking endorsed jars dir" >&5
-echo $ECHO_N "checking endorsed jars dir... $ECHO_C" >&6; }
-          ENDORSED_JARS="${withval}"
-          { echo "$as_me:$LINENO: result: ${withval}" >&5
+# Check whether --with-xalan2-jar was given.
+if test "${with_xalan2_jar+set}" = set; then
+  withval=$with_xalan2_jar;
+    if test -f "${withval}"; then
+      { echo "$as_me:$LINENO: checking xalan2 jar" >&5
+echo $ECHO_N "checking xalan2 jar... $ECHO_C" >&6; }
+      XALAN2_JAR="${withval}"
+      { echo "$as_me:$LINENO: result: ${withval}" >&5
 echo "${ECHO_T}${withval}" >&6; }
-        fi
-      fi
     fi
 
 else
 
-    ENDORSED_JARS=
-
-fi
-
-  if test -z "${ENDORSED_JARS}"; then
-    { echo "$as_me:$LINENO: checking for endorsed jars dir" >&5
-echo $ECHO_N "checking for endorsed jars dir... $ECHO_C" >&6; }
-    if test -f "/usr/share/java/xalan-j2.jar"; then
-      if test -f "/usr/share/java/xalan-j2-serializer.jar"; then
-        if test -f "/usr/share/java/xerces-j2.jar"; then
-          ENDORSED_JARS="/usr/share/java/xalan-j2.jar /usr/share/java/xalan-j2-serializer.jar /usr/share/java/xerces-j2.jar"
-          { echo "$as_me:$LINENO: result: /usr/share/java" >&5
-echo "${ECHO_T}/usr/share/java" >&6; }
-        fi
-      fi
-    fi
-    if test -z "${ENDORSED_JARS}"; then
-      { echo "$as_me:$LINENO: result: missing" >&5
-echo "${ECHO_T}missing" >&6; }
+    XALAN2_JAR=
+
+fi
+
+  if test -z "${XALAN2_JAR}"; then
+    { echo "$as_me:$LINENO: checking for xalan2 jar" >&5
+echo $ECHO_N "checking for xalan2 jar... $ECHO_C" >&6; }
+    if test -e "/usr/share/java/xalan-j2.jar"; then
+      XALAN2_JAR=/usr/share/java/xalan-j2.jar
+      { echo "$as_me:$LINENO: result: ${XALAN2_JAR}" >&5
+echo "${ECHO_T}${XALAN2_JAR}" >&6; }
+    elif test -e "/usr/share/java/xalan2.jar"; then
+      XALAN2_JAR=/usr/share/java/xalan2.jar
+      { echo "$as_me:$LINENO: result: ${XALAN2_JAR}" >&5
+echo "${ECHO_T}${XALAN2_JAR}" >&6; }
+    else
+      { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
     fi
   fi
-  if test -z "${ENDORSED_JARS}"; then
-    { { echo "$as_me:$LINENO: error: \"A directory containing required jars (xalan-j2.jar, xalan-j2-serializer.jar, xerces-j2.jar) was not found.\"" >&5
-echo "$as_me: error: \"A directory containing required jars (xalan-j2.jar, xalan-j2-serializer.jar, xerces-j2.jar) was not found.\"" >&2;}
+  if test -z "${XALAN2_JAR}"; then
+    { { echo "$as_me:$LINENO: error: \"A xalan2 jar was not found.\"" >&5
+echo "$as_me: error: \"A xalan2 jar was not found.\"" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+
+
+
+
+# Check whether --with-xalan2-serializer-jar was given.
+if test "${with_xalan2_serializer_jar+set}" = set; then
+  withval=$with_xalan2_serializer_jar;
+    if test -f "${withval}"; then
+      { echo "$as_me:$LINENO: checking xalan2 serializer jar" >&5
+echo $ECHO_N "checking xalan2 serializer jar... $ECHO_C" >&6; }
+      XALAN2_SERIALIZER_JAR="${withval}"
+      { echo "$as_me:$LINENO: result: ${withval}" >&5
+echo "${ECHO_T}${withval}" >&6; }
+    fi
+
+else
+
+    XALAN2_SERIALIZER_JAR=
+
+fi
+
+  if test -z "${XALAN2_SERIALIZER_JAR}"; then
+    { echo "$as_me:$LINENO: checking for xalan2-serializer jar" >&5
+echo $ECHO_N "checking for xalan2-serializer jar... $ECHO_C" >&6; }
+    if test -e "/usr/share/java/xalan-j2-serializer.jar"; then
+      XALAN2_SERIALIZER_JAR=/usr/share/java/xalan-j2-serializer.jar
+      { echo "$as_me:$LINENO: result: ${XALAN2_SERIALIZER_JAR}" >&5
+echo "${ECHO_T}${XALAN2_SERIALIZER_JAR}" >&6; }
+    elif test -e "/usr/share/java/xalan2.jar"; then
+      XALAN2_SERIALIZER_JAR=/usr/share/java/xalan2.jar
+      { echo "$as_me:$LINENO: result: ${XALAN2_SERIALIZER_JAR}" >&5
+echo "${ECHO_T}${XALAN2_SERIALIZER_JAR}" >&6; }
+    else
+      { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+    fi
+  fi
+  if test -z "${XALAN2_SERIALIZER_JAR}"; then
+    { { echo "$as_me:$LINENO: error: \"A xalan2-serializer jar was not found.\"" >&5
+echo "$as_me: error: \"A xalan2-serializer jar was not found.\"" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+
+
+
+
+# Check whether --with-xerces2-jar was given.
+if test "${with_xerces2_jar+set}" = set; then
+  withval=$with_xerces2_jar;
+    if test -f "${withval}"; then
+      { echo "$as_me:$LINENO: checking xerces2 jar" >&5
+echo $ECHO_N "checking xerces2 jar... $ECHO_C" >&6; }
+      XERCES2_JAR="${withval}"
+      { echo "$as_me:$LINENO: result: ${withval}" >&5
+echo "${ECHO_T}${withval}" >&6; }
+    fi
+
+else
+
+    XERCES2_JAR=
+
+fi
+
+  if test -z "${XERCES2_JAR}"; then
+    { echo "$as_me:$LINENO: checking for xerces2 jar" >&5
+echo $ECHO_N "checking for xerces2 jar... $ECHO_C" >&6; }
+    if test -e "/usr/share/java/xerces-j2.jar"; then
+      XERCES2_JAR=/usr/share/java/xerces-j2.jar
+      { echo "$as_me:$LINENO: result: ${XERCES2_JAR}" >&5
+echo "${ECHO_T}${XERCES2_JAR}" >&6; }
+    elif test -e "/usr/share/java/xerces2.jar"; then
+      XERCES2_JAR=/usr/share/java/xerces2.jar
+      { echo "$as_me:$LINENO: result: ${XERCES2_JAR}" >&5
+echo "${ECHO_T}${XERCES2_JAR}" >&6; }
+    else
+      { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+    fi
+  fi
+  if test -z "${XERCES2_JAR}"; then
+    { { echo "$as_me:$LINENO: error: \"A xerces2 jar was not found.\"" >&5
+echo "$as_me: error: \"A xerces2 jar was not found.\"" >&2;}
    { (exit 1); exit 1; }; }
   fi
 
@@ -7609,7 +7692,9 @@
 RMIC!$RMIC$ac_delim
 ECJ_JAR!$ECJ_JAR$ac_delim
 LIBGCJ_JAR!$LIBGCJ_JAR$ac_delim
-ENDORSED_JARS!$ENDORSED_JARS$ac_delim
+XALAN2_JAR!$XALAN2_JAR$ac_delim
+XALAN2_SERIALIZER_JAR!$XALAN2_SERIALIZER_JAR$ac_delim
+XERCES2_JAR!$XERCES2_JAR$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
@@ -7620,7 +7705,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 15; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- a/configure.ac	Thu Jun 07 12:14:52 2007 -0400
+++ b/configure.ac	Thu Jun 07 19:21:19 2007 -0400
@@ -29,7 +29,9 @@
 FIND_RMIC
 FIND_ECJ_JAR
 FIND_LIBGCJ_JAR
-FIND_ENDORSED_JARS
+FIND_XALAN2_JAR
+FIND_XALAN2_SERIALIZER_JAR
+FIND_XERCES2_JAR
 WITH_OPENJDK_SRC_DIR
 
 CHECK_HEADERS