Mercurial > hg > release > icedtea-1.10

changeset 798:fc2725fed5d1 cacao

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2008-02-05 Lillian Angel <langel@redhat.com> * Makefile.am: Changed LIBGCJ_OLD to GCC_OLD. * Makefile.in: Regenerate. * acinclude.m4: Renamed LIBGCJ_OLD to GCC_OLD. * configure: Regenerate. * configure.ac: Renamed LIBGCJ_OLD to GCC_OLD.
author Lillian Angel <langel@redhat.com>
date Tue, 05 Feb 2008 16:56:59 -0500
parents a2497d56461b
children 341e02e1aab6
files ChangeLog Makefile.am acinclude.m4 configure configure.ac
diffstat 5 files changed, 41 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Feb 05 15:58:12 2008 -0500
+++ b/ChangeLog	Tue Feb 05 16:56:59 2008 -0500
@@ -1,3 +1,11 @@
+2008-02-05  Lillian Angel  <langel@redhat.com>
+
+	* Makefile.am: Changed LIBGCJ_OLD to GCC_OLD.
+	* Makefile.in: Regenerate.
+	* acinclude.m4: Renamed LIBGCJ_OLD to GCC_OLD.
+	* configure: Regenerate.
+	* configure.ac: Renamed LIBGCJ_OLD to GCC_OLD.
+
 2008-02-05  Joshua Sumali  <jsumali@redhat.com>
 
 	* tools/netx/jnlp/Launcher.java: Removed unused line.
--- a/Makefile.am	Tue Feb 05 15:58:12 2008 -0500
+++ b/Makefile.am	Tue Feb 05 16:56:59 2008 -0500
@@ -191,8 +191,8 @@
   FAST_BUILD_PATCH =
 endif
 
-# If new libgcj is installed, apply 4.3 patch
-if LIBGCJ_OLD
+# If new gcc is installed, apply 4.3 patch
+if GCC_OLD
   GCC_PATCH =
 else
   GCC_PATCH = patches/icedtea-gcc-4.3.patch
--- a/acinclude.m4	Tue Feb 05 15:58:12 2008 -0500
+++ b/acinclude.m4	Tue Feb 05 16:56:59 2008 -0500
@@ -196,7 +196,7 @@
 
 AC_DEFUN([FIND_LIBGCJ_JAR],
 [
-  AM_CONDITIONAL(LIBGCJ_OLD, test x != x)
+  AM_CONDITIONAL(GCC_OLD, test x != x)
   AC_ARG_WITH([libgcj-jar],
               [AS_HELP_STRING(--with-libgcj-jar,specify location of the libgcj 4.3.0 jar)],
   [
@@ -219,7 +219,7 @@
         LIBGCJ_JAR=/usr/share/java/libgcj-4.3.jar
 	AC_MSG_RESULT(${LIBGCJ_JAR})
       else
-	AM_CONDITIONAL(LIBGCJ_OLD, test x = x)
+	AM_CONDITIONAL(GCC_OLD, test x = x)
         if test -e "/usr/share/java/libgcj-4.1.2.jar"; then
           LIBGCJ_JAR=/usr/share/java/libgcj-4.1.2.jar
           AC_MSG_RESULT(${LIBGCJ_JAR})
--- a/configure	Tue Feb 05 15:58:12 2008 -0500
+++ b/configure	Tue Feb 05 16:56:59 2008 -0500
@@ -725,8 +725,8 @@
 JAVAH
 JAR
 RMIC
-LIBGCJ_OLD_TRUE
-LIBGCJ_OLD_FALSE
+GCC_OLD_TRUE
+GCC_OLD_FALSE
 ECJ
 ECJ_JAR
 LIBGCJ_JAR
@@ -4942,11 +4942,11 @@
   RMIC=${SYSTEM_ICEDTEA_DIR}/bin/rmic
 
    if test x != x; then
-  LIBGCJ_OLD_TRUE=
-  LIBGCJ_OLD_FALSE='#'
-else
-  LIBGCJ_OLD_TRUE='#'
-  LIBGCJ_OLD_FALSE=
+  GCC_OLD_TRUE=
+  GCC_OLD_FALSE='#'
+else
+  GCC_OLD_TRUE='#'
+  GCC_OLD_FALSE=
 fi
 
 else
@@ -6571,11 +6571,11 @@
 
 
    if test x != x; then
-  LIBGCJ_OLD_TRUE=
-  LIBGCJ_OLD_FALSE='#'
-else
-  LIBGCJ_OLD_TRUE='#'
-  LIBGCJ_OLD_FALSE=
+  GCC_OLD_TRUE=
+  GCC_OLD_FALSE='#'
+else
+  GCC_OLD_TRUE='#'
+  GCC_OLD_FALSE=
 fi
 
 
@@ -6610,11 +6610,11 @@
 echo "${ECHO_T}${LIBGCJ_JAR}" >&6; }
       else
 	 if test x = x; then
-  LIBGCJ_OLD_TRUE=
-  LIBGCJ_OLD_FALSE='#'
-else
-  LIBGCJ_OLD_TRUE='#'
-  LIBGCJ_OLD_FALSE=
+  GCC_OLD_TRUE=
+  GCC_OLD_FALSE='#'
+else
+  GCC_OLD_TRUE='#'
+  GCC_OLD_FALSE=
 fi
 
         if test -e "/usr/share/java/libgcj-4.1.2.jar"; then
@@ -10205,24 +10205,24 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${LIBGCJ_OLD_TRUE}" && test -z "${LIBGCJ_OLD_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"LIBGCJ_OLD\" was never defined.
+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 \"LIBGCJ_OLD\" was never defined.
+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 "${LIBGCJ_OLD_TRUE}" && test -z "${LIBGCJ_OLD_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"LIBGCJ_OLD\" was never defined.
+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 \"LIBGCJ_OLD\" was never defined.
+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 "${LIBGCJ_OLD_TRUE}" && test -z "${LIBGCJ_OLD_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"LIBGCJ_OLD\" was never defined.
+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 \"LIBGCJ_OLD\" was never defined.
+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
@@ -10936,8 +10936,8 @@
 JAVAH!$JAVAH$ac_delim
 JAR!$JAR$ac_delim
 RMIC!$RMIC$ac_delim
-LIBGCJ_OLD_TRUE!$LIBGCJ_OLD_TRUE$ac_delim
-LIBGCJ_OLD_FALSE!$LIBGCJ_OLD_FALSE$ac_delim
+GCC_OLD_TRUE!$GCC_OLD_TRUE$ac_delim
+GCC_OLD_FALSE!$GCC_OLD_FALSE$ac_delim
 ECJ!$ECJ$ac_delim
 ECJ_JAR!$ECJ_JAR$ac_delim
 LIBGCJ_JAR!$LIBGCJ_JAR$ac_delim
--- a/configure.ac	Tue Feb 05 15:58:12 2008 -0500
+++ b/configure.ac	Tue Feb 05 16:56:59 2008 -0500
@@ -108,7 +108,7 @@
   AC_SUBST(JAR)
   RMIC=${SYSTEM_ICEDTEA_DIR}/bin/rmic
   AC_SUBST(RMIC)
-  AM_CONDITIONAL(LIBGCJ_OLD, test x != x)
+  AM_CONDITIONAL(GCC_OLD, test x != x)
 else
   FIND_JAVA
   FIND_JAVAC