Mercurial > hg > release > icedtea6-1.3

changeset 761:c158f20b371c 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> * configure: Regenerated. * configure.ac: Added conditional for WITH_OPENJDK.
author Lillian Angel <langel@redhat.com>
date Tue, 11 Mar 2008 16:04:05 -0400
parents 3b49a322c9dd
children 30e860293151
files ChangeLog configure configure.ac
diffstat 3 files changed, 51 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Mar 11 20:47:35 2008 +0100
+++ b/ChangeLog	Tue Mar 11 16:04:05 2008 -0400
@@ -4,6 +4,11 @@
 
 2008-03-11  Lillian Angel  <langel@redhat.com>
 
+	* configure: Regenerated.
+	* configure.ac: Added conditional for WITH_OPENJDK.
+
+2008-03-11  Lillian Angel  <langel@redhat.com>
+
 	* Makefile.am: Added check for WITH_OPENJDK.
 	* Makefile.in: Regenerated.
 	* configure: Regenerated.
--- a/configure	Tue Mar 11 20:47:35 2008 +0100
+++ b/configure	Tue Mar 11 16:04:05 2008 -0400
@@ -5384,7 +5384,28 @@
 
 
 
-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
 
@@ -7243,6 +7264,7 @@
   ac_config_files="$ac_config_files javap"
 
 fi
+fi
 
   { echo "$as_me:$LINENO: checking openjdk source zip" >&5
 echo $ECHO_N "checking openjdk source zip... $ECHO_C" >&6; }
@@ -10668,6 +10690,13 @@
 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
 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
--- a/configure.ac	Tue Mar 11 20:47:35 2008 +0100
+++ b/configure.ac	Tue Mar 11 16:04:05 2008 -0400
@@ -132,7 +132,21 @@
 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 @@
   AC_CONFIG_FILES([javac], [chmod +x javac])
   AC_CONFIG_FILES([javap], [chmod +x javap])
 fi
+fi
 WITH_OPENJDK_SRC_ZIP
 WITH_OPENJDK_SRC_DIR
 AC_CHECK_WITH_CACAO