Mercurial > hg > release > icedtea7-2.6
changeset 2679:1885a2b6d744
Enable Zero when Shark is enabled.
2014-01-09 Andrew John Hughes <gnu.andrew@member.fsf.org>
* acinclude.m4:
(IT_ENABLE_ZERO_BUILD): Require IT_ENABLE_SHARK
so use_shark is set.
(IT_ENABLE_SHARK): Rewrite of IT_SET_SHARK_BUILD
to simplify & match style of similar macros.
* configure.ac:
Don't invoke IT_SET_SHARK_BUILD explicitly.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Sun, 12 Jan 2014 01:25:32 -0600 |
| parents | 2ecadf456797 |
| children | d41c1fc06514 |
| files | ChangeLog acinclude.m4 configure.ac |
| diffstat | 3 files changed, 18 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Dec 26 23:17:45 2013 +0000 +++ b/ChangeLog Sun Jan 12 01:25:32 2014 -0600 @@ -1,3 +1,13 @@ +2014-01-09 Andrew John Hughes <gnu.andrew@member.fsf.org> + + * acinclude.m4: + (IT_ENABLE_ZERO_BUILD): Require IT_ENABLE_SHARK + so use_shark is set. + (IT_ENABLE_SHARK): Rewrite of IT_SET_SHARK_BUILD + to simplify & match style of similar macros. + * configure.ac: + Don't invoke IT_SET_SHARK_BUILD explicitly. + 2013-12-26 Andrew John Hughes <gnu.andrew@member.fsf.org> * Makefile.am:
--- a/acinclude.m4 Thu Dec 26 23:17:45 2013 +0000 +++ b/acinclude.m4 Sun Jan 12 01:25:32 2014 -0600 @@ -662,6 +662,7 @@ AC_REQUIRE([IT_SET_ARCH_SETTINGS]) AC_REQUIRE([IT_ENABLE_CACAO]) AC_REQUIRE([IT_ENABLE_JAMVM]) + AC_REQUIRE([IT_ENABLE_SHARK]) AC_MSG_CHECKING([whether to use the zero-assembler port]) use_zero=no AC_ARG_ENABLE([zero], @@ -735,28 +736,20 @@ AC_SUBST(ZERO_ARCHDEF) ]) -AC_DEFUN([IT_SET_SHARK_BUILD], +AC_DEFUN_ONCE([IT_ENABLE_SHARK], [ - AC_MSG_CHECKING(whether to use the Shark JIT) - shark_selected=no + AC_MSG_CHECKING([whether to use the Shark JIT]) AC_ARG_ENABLE([shark], [AS_HELP_STRING(--enable-shark, use Shark JIT)], [ - case "${enableval}" in - no) - ;; - *) - shark_selected=yes - ;; - esac + use_shark="${enableval}" + ], + [ + use_shark=no ]) - use_shark=no - if test "x${shark_selected}" = "xyes"; then - use_shark=yes - fi AC_MSG_RESULT($use_shark) - AM_CONDITIONAL(SHARK_BUILD, test "x${use_shark}" = xyes) + AC_SUBST(ENABLE_SHARK) ]) AC_DEFUN([IT_ENABLE_CACAO],