Mercurial > hg > release > icedtea-1.10
changeset 795:dfceaf5eca54 cacao
2008-02-05 Lillian Angel <langel@redhat.com>
* acinclude.m4: Moved conditional to beginning of LIBGCJ block.
* configure: Regenerate.
* configure.ac: Set LIBGCJ_OLD conditional to false if --with-icedtea
option is used. If building with icedtea, gcc 4.3 must be installed.
| author | Lillian Angel <langel@redhat.com> |
|---|---|
| date | Tue, 05 Feb 2008 12:21:59 -0500 |
| parents | 9fe8d110d66a |
| children | 217c9bffb37f |
| files | ChangeLog acinclude.m4 configure configure.ac |
| diffstat | 4 files changed, 36 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Feb 05 11:37:45 2008 -0500 +++ b/ChangeLog Tue Feb 05 12:21:59 2008 -0500 @@ -1,3 +1,10 @@ +2008-02-05 Lillian Angel <langel@redhat.com> + + * acinclude.m4: Moved conditional to beginning of LIBGCJ block. + * configure: Regenerate. + * configure.ac: Set LIBGCJ_OLD conditional to false if --with-icedtea + option is used. If building with icedtea, gcc 4.3 must be installed. + 2008-02-05 Lillian Angel <langel@redhat.com> * Makefile.am: Only apply patches/icedtea-gcc-4.3.patch if
--- a/acinclude.m4 Tue Feb 05 11:37:45 2008 -0500 +++ b/acinclude.m4 Tue Feb 05 12:21:59 2008 -0500 @@ -196,6 +196,7 @@ AC_DEFUN([FIND_LIBGCJ_JAR], [ + AM_CONDITIONAL(LIBGCJ_OLD, test x != x) AC_ARG_WITH([libgcj-jar], [AS_HELP_STRING(--with-libgcj-jar,specify location of the libgcj 4.3.0 jar)], [ @@ -209,7 +210,6 @@ LIBGCJ_JAR= ]) if test -z "${LIBGCJ_JAR}"; then - AM_CONDITIONAL(LIBGCJ_OLD, test x != x) AC_MSG_CHECKING(for libgcj-4.3.0.jar or lib-4.1.2.jar) if test -e "/usr/share/java/libgcj-4.3.0.jar"; then LIBGCJ_JAR=/usr/share/java/libgcj-4.3.0.jar
--- a/configure Tue Feb 05 11:37:45 2008 -0500 +++ b/configure Tue Feb 05 12:21:59 2008 -0500 @@ -725,10 +725,10 @@ JAVAH JAR RMIC +LIBGCJ_OLD_TRUE +LIBGCJ_OLD_FALSE ECJ ECJ_JAR -LIBGCJ_OLD_TRUE -LIBGCJ_OLD_FALSE LIBGCJ_JAR XALAN2_JAR XALAN2_SERIALIZER_JAR @@ -4941,6 +4941,14 @@ RMIC=${SYSTEM_ICEDTEA_DIR}/bin/rmic + if test x != x; then + LIBGCJ_OLD_TRUE= + LIBGCJ_OLD_FALSE='#' +else + LIBGCJ_OLD_TRUE='#' + LIBGCJ_OLD_FALSE= +fi + else @@ -6562,6 +6570,14 @@ + if test x != x; then + LIBGCJ_OLD_TRUE= + LIBGCJ_OLD_FALSE='#' +else + LIBGCJ_OLD_TRUE='#' + LIBGCJ_OLD_FALSE= +fi + # Check whether --with-libgcj-jar was given. if test "${with_libgcj_jar+set}" = set; then @@ -6581,14 +6597,6 @@ fi if test -z "${LIBGCJ_JAR}"; then - if test x != x; then - LIBGCJ_OLD_TRUE= - LIBGCJ_OLD_FALSE='#' -else - LIBGCJ_OLD_TRUE='#' - LIBGCJ_OLD_FALSE= -fi - { echo "$as_me:$LINENO: checking for libgcj-4.3.0.jar or lib-4.1.2.jar" >&5 echo $ECHO_N "checking for libgcj-4.3.0.jar or lib-4.1.2.jar... $ECHO_C" >&6; } if test -e "/usr/share/java/libgcj-4.3.0.jar"; then @@ -10211,6 +10219,13 @@ 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. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"LIBGCJ_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 @@ -10921,10 +10936,10 @@ 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 ECJ!$ECJ$ac_delim ECJ_JAR!$ECJ_JAR$ac_delim -LIBGCJ_OLD_TRUE!$LIBGCJ_OLD_TRUE$ac_delim -LIBGCJ_OLD_FALSE!$LIBGCJ_OLD_FALSE$ac_delim LIBGCJ_JAR!$LIBGCJ_JAR$ac_delim XALAN2_JAR!$XALAN2_JAR$ac_delim XALAN2_SERIALIZER_JAR!$XALAN2_SERIALIZER_JAR$ac_delim