Mercurial > hg > release > icedtea6-1.6
changeset 1704:833ee1f40cf8
Improve clarity of DISABLE_OPTIMIZATIONS macro.
2010-03-11 Andrew John Hughes <ahughes@redhat.com>
* acinclude.m4:
(DISABLE_OPTIMIZATIONS): Output a result
in the default case. Provide DISABLE_OPTIMIZATIONS
so Makefile test does not need to be inversed
and output matches variable setting.
* Makefile.am:
Use DISABLE_OPTIMIZATIONS rather than !ENABLE_OPTIMIZATIONS.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Thu, 11 Mar 2010 23:34:09 +0000 |
| parents | b12e1a83a817 |
| children | d7a1543dcb1e |
| files | ChangeLog Makefile.am acinclude.m4 |
| diffstat | 3 files changed, 18 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Mar 11 23:24:05 2010 +0000 +++ b/ChangeLog Thu Mar 11 23:34:09 2010 +0000 @@ -1,3 +1,13 @@ +2010-03-11 Andrew John Hughes <ahughes@redhat.com> + + * acinclude.m4: + (DISABLE_OPTIMIZATIONS): Output a result + in the default case. Provide DISABLE_OPTIMIZATIONS + so Makefile test does not need to be inversed + and output matches variable setting. + * Makefile.am: + Use DISABLE_OPTIMIZATIONS rather than !ENABLE_OPTIMIZATIONS. + 2010-03-11 Andrew John Hughes <ahughes@redhat.com> * acinclude.m4:
--- a/Makefile.am Thu Mar 11 23:24:05 2010 +0000 +++ b/Makefile.am Thu Mar 11 23:34:09 2010 +0000 @@ -194,7 +194,7 @@ ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)" endif -if !ENABLE_OPTIMIZATIONS +if DISABLE_OPTIMIZATIONS ICEDTEA_ENV += \ NO_OPTIMIZATIONS="true" \ CC_NO_OPT="-O0 -g" @@ -277,7 +277,7 @@ ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)" endif -if !ENABLE_OPTIMIZATIONS +if DISABLE_OPTIMIZATIONS ICEDTEA_ENV_ECJ += \ NO_OPTIMIZATIONS="true" \ CC_NO_OPT="-O0 -g"
--- a/acinclude.m4 Thu Mar 11 23:24:05 2010 +0000 +++ b/acinclude.m4 Thu Mar 11 23:34:09 2010 +0000 @@ -644,25 +644,24 @@ AC_DEFUN([ENABLE_OPTIMIZATIONS], [ - AC_MSG_CHECKING(whether to disable optimizations) + AC_MSG_CHECKING([whether to disable optimizations]) AC_ARG_ENABLE([optimizations], [AS_HELP_STRING(--disable-optimizations,build with -O0 -g [[default=no]])], [ case "${enableval}" in no) - AC_MSG_RESULT([yes, building with -O0 -g]) - enable_optimizations=no + disable_optimizations=yes ;; *) - AC_MSG_RESULT([no]) - enable_optimizations=yes + disable_optimizations=no ;; esac ], [ - enable_optimizations=yes + disable_optimizations=no ]) - AM_CONDITIONAL([ENABLE_OPTIMIZATIONS], test x"${enable_optimizations}" = "xyes") + AC_MSG_RESULT([$disable_optimizations]) + AM_CONDITIONAL([DISABLE_OPTIMIZATIONS], test x"${disable_optimizations}" = "xyes") ]) AC_DEFUN([FIND_TOOL],