changeset in /hg/icedtea: 2008-03-11 Lillian Angel <langel at red...

[Lillian Angel]

changeset de1412d38f71 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=de1412d38f71
description:
	2008-03-11  Lillian Angel  <langel at redhat.com>

	        * configure: Regenerated.
	        * configure.ac: Added conditional for WITH_OPENJDK.

diffstat:

3 files changed, 51 insertions(+), 2 deletions(-)
ChangeLog    |    5 +++++
configure    |   31 ++++++++++++++++++++++++++++++-
configure.ac |   17 ++++++++++++++++-

diffs (101 lines):

diff -r a2a49896df38 -r de1412d38f71 ChangeLog
--- a/ChangeLog	Tue Mar 11 20:47:35 2008 +0100
+++ b/ChangeLog	Tue Mar 11 16:06:10 2008 -0400
@@ -1,3 +1,8 @@ 2008-03-11  Matthias Klose  <doko at ubuntu
+2008-03-11  Lillian Angel  <langel at redhat.com>
+
+	* configure: Regenerated.
+	* configure.ac: Added conditional for WITH_OPENJDK.
+
 2008-03-11  Matthias Klose  <doko at ubuntu.com>
 
 	* .hgignore: Add debian packaging directory.
diff -r a2a49896df38 -r de1412d38f71 configure
--- a/configure	Tue Mar 11 20:47:35 2008 +0100
+++ b/configure	Tue Mar 11 16:06:10 2008 -0400
@@ -5380,7 +5380,28 @@ fi
 
 
 
-if test "${with_icedtea}" == true || test "${with_openjdk}" == true
+if test "${with_openjdk}" == true
+then
+  JAVA=$SYSTEM_OPENJDK_DIR/bin/java
+
+  JAVAC=${SYSTEM_OPENJDK_DIR}/bin/javac
+
+  JAVAH=${SYSTEM_OPENJDK_DIR}/bin/javah
+
+  JAR=${SYSTEM_OPENJDK_DIR}/bin/jar
+
+  RMIC=${SYSTEM_OPENJDK_DIR}/bin/rmic
+
+   if test x != x; then
+  GCC_OLD_TRUE=
+  GCC_OLD_FALSE='#'
+else
+  GCC_OLD_TRUE='#'
+  GCC_OLD_FALSE=
+fi
+
+else
+if test "${with_icedtea}" == true
 then
   JAVA=$SYSTEM_ICEDTEA_DIR/bin/java
 
@@ -7238,6 +7259,7 @@ echo "$as_me: error: \"A xerces2 jar was
 
   ac_config_files="$ac_config_files javap"
 
+fi
 fi
 
   { echo "$as_me:$LINENO: checking openjdk source zip" >&5
@@ -10602,6 +10624,13 @@ if test -z "${WITH_OPENJDK_TRUE}" && tes
   { { 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
+echo "$as_me: error: conditional \"GCC_OLD\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
diff -r a2a49896df38 -r de1412d38f71 configure.ac
--- a/configure.ac	Tue Mar 11 20:47:35 2008 +0100
+++ b/configure.ac	Tue Mar 11 16:06:10 2008 -0400
@@ -132,7 +132,21 @@ AM_CONDITIONAL(WITH_OPENJDK, test "${wit
 AM_CONDITIONAL(WITH_OPENJDK, test "${with_openjdk}" == true)
 
 SET_ARCH_DIRS
-if test "${with_icedtea}" == true || test "${with_openjdk}" == true
+if test "${with_openjdk}" == true
+then
+  JAVA=$SYSTEM_OPENJDK_DIR/bin/java
+  AC_SUBST(JAVA)
+  JAVAC=${SYSTEM_OPENJDK_DIR}/bin/javac
+  AC_SUBST(JAVAC)
+  JAVAH=${SYSTEM_OPENJDK_DIR}/bin/javah
+  AC_SUBST(JAVAH)
+  JAR=${SYSTEM_OPENJDK_DIR}/bin/jar
+  AC_SUBST(JAR)
+  RMIC=${SYSTEM_OPENJDK_DIR}/bin/rmic
+  AC_SUBST(RMIC)
+  AM_CONDITIONAL(GCC_OLD, test x != x)
+else
+if test "${with_icedtea}" == true
 then
   JAVA=$SYSTEM_ICEDTEA_DIR/bin/java
   AC_SUBST(JAVA)
@@ -159,6 +173,7 @@ else
   AC_CONFIG_FILES([javac], [chmod +x javac])
   AC_CONFIG_FILES([javap], [chmod +x javap])
 fi
+fi
 WITH_OPENJDK_SRC_ZIP
 WITH_OPENJDK_SRC_DIR
 ENABLE_FAST_BUILD