changeset in /hg/icedtea: 2008-02-05 Lillian Angel <langel at red...
Lillian Angel
langel at redhat.com
Tue Feb 5 13:59:19 PST 2008
changeset 5e274c64b840 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5e274c64b840
description:
2008-02-05 Lillian Angel <langel at 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.
diffstat:
6 files changed, 45 insertions(+), 37 deletions(-)
ChangeLog | 8 ++++++++
Makefile.am | 4 ++--
Makefile.in | 8 ++++----
acinclude.m4 | 4 ++--
configure | 56 ++++++++++++++++++++++++++++----------------------------
configure.ac | 2 +-
diffs (190 lines):
diff -r ddd7f2a22c15 -r 5e274c64b840 ChangeLog
--- 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 Joshua Sumali <jsumali at redh
+2008-02-05 Lillian Angel <langel at 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 at redhat.com>
* tools/netx/jnlp/Launcher.java: Removed unused line.
diff -r ddd7f2a22c15 -r 5e274c64b840 Makefile.am
--- a/Makefile.am Tue Feb 05 15:58:12 2008 -0500
+++ b/Makefile.am Tue Feb 05 16:56:59 2008 -0500
@@ -181,8 +181,8 @@ else
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
diff -r ddd7f2a22c15 -r 5e274c64b840 Makefile.in
--- a/Makefile.in Tue Feb 05 15:58:12 2008 -0500
+++ b/Makefile.in Tue Feb 05 16:56:59 2008 -0500
@@ -280,10 +280,10 @@ OPENJDK_URL = http://hg.openjdk.java.net
# Patch OpenJDK sources for plug replacements.
@FAST_BUILD_TRUE at FAST_BUILD_PATCH = patches/icedtea-speed.patch
- at LIBGCJ_OLD_FALSE@GCC_PATCH = patches/icedtea-gcc-4.3.patch
-
-# If new libgcj is installed, apply 4.3 patch
- at LIBGCJ_OLD_TRUE@GCC_PATCH =
+ at GCC_OLD_FALSE@GCC_PATCH = patches/icedtea-gcc-4.3.patch
+
+# If new gcc is installed, apply 4.3 patch
+ at GCC_OLD_TRUE@GCC_PATCH =
ICEDTEA_PATCHES = \
patches/icedtea-copy-plugs.patch \
patches/icedtea-version.patch \
diff -r ddd7f2a22c15 -r 5e274c64b840 acinclude.m4
--- 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_ECJ_JAR],
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 @@ AC_DEFUN([FIND_LIBGCJ_JAR],
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})
diff -r ddd7f2a22c15 -r 5e274c64b840 configure
--- 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
JAVAH
JAR
RMIC
-LIBGCJ_OLD_TRUE
-LIBGCJ_OLD_FALSE
+GCC_OLD_TRUE
+GCC_OLD_FALSE
ECJ
ECJ_JAR
LIBGCJ_JAR
@@ -4938,11 +4938,11 @@ then
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
@@ -6567,11 +6567,11 @@ echo "$as_me: error: \"A ECJ jar was not
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
@@ -6606,11 +6606,11 @@ echo "${ECHO_T}${LIBGCJ_JAR}" >&6; }
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
@@ -10163,24 +10163,24 @@ Usually this means the macro was only in
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
@@ -10887,8 +10887,8 @@ JAVAH!$JAVAH$ac_delim
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
diff -r ddd7f2a22c15 -r 5e274c64b840 configure.ac
--- 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 @@ then
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
More information about the distro-pkg-dev
mailing list