Mercurial > hg > release > icedtea6-1.6
changeset 1698:613dba6ad21b
Make --enable-shark work without requiring --enable-zero as well.
2010-01-15 Andrew John Hughes <ahughes@redhat.com>
* acinclude.m4,
* configure.ac:
Make --enable-shark work without requiring
--enable-zero as well.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 27 Jan 2010 15:55:16 +0000 |
| parents | 66c327225114 |
| children | 29c75d7fc03a |
| files | ChangeLog acinclude.m4 configure.ac |
| diffstat | 3 files changed, 29 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Dec 17 16:59:58 2009 +0000 +++ b/ChangeLog Wed Jan 27 15:55:16 2010 +0000 @@ -1,3 +1,10 @@ +2010-01-15 Andrew John Hughes <ahughes@redhat.com> + + * acinclude.m4, + * configure.ac: + Make --enable-shark work without requiring + --enable-zero as well. + 2009-12-17 Andrew Haley <aph@redhat.com> * Makefile.am (EXTRA_DIST): Add mkbc.c.
--- a/acinclude.m4 Thu Dec 17 16:59:58 2009 +0000 +++ b/acinclude.m4 Wed Jan 27 15:55:16 2010 +0000 @@ -691,21 +691,27 @@ esac ], [ - case "${host}" in - i?86-*-*) ;; - sparc*-*-*) ;; - x86_64-*-*) ;; - *) - if test "x${WITH_CACAO}" != xno; then - use_zero=no - else - use_zero=yes - fi - ;; - esac + if test "x${use_shark}" = "xyes"; then + use_zero=yes; + else + case "${host}" in + i?86-*-*) ;; + sparc*-*-*) ;; + x86_64-*-*) ;; + *) + use_core=yes + if test "x${WITH_CACAO}" != xno; then + use_zero=no + else + use_zero=yes + fi + ;; + esac + fi ]) AC_MSG_RESULT($use_zero) AM_CONDITIONAL(ZERO_BUILD, test "x${use_zero}" = xyes) + AM_CONDITIONAL(CORE_BUILD, test "x${use_core}" = xyes) ZERO_LIBARCH= ZERO_BITSPERWORD= @@ -766,35 +772,23 @@ AC_CONFIG_FILES([ergo.c]) ]) -AC_DEFUN([SET_CORE_OR_SHARK_BUILD], +AC_DEFUN([SET_SHARK_BUILD], [ AC_MSG_CHECKING(whether to use the Shark JIT) - shark_selected=no AC_ARG_ENABLE([shark], [AS_HELP_STRING(--enable-shark, use Shark JIT)], [ case "${enableval}" in no) + use_shark=no ;; *) - shark_selected=yes + use_shark=yes ;; esac ]) - use_core=no - use_shark=no - if test "x${WITH_CACAO}" != "xno"; then - use_core=yes - elif test "x${use_zero}" = "xyes"; then - if test "x${shark_selected}" = "xyes"; then - use_shark=yes - else - use_core=yes - fi - fi AC_MSG_RESULT($use_shark) - AM_CONDITIONAL(CORE_BUILD, test "x${use_core}" = xyes) AM_CONDITIONAL(SHARK_BUILD, test "x${use_shark}" = xyes) ])