# HG changeset patch # User Andrew John Hughes # Date 1372549689 -3600 # Node ID c927db268b09520a9562148c13dd42dc6ad3e73d # Parent 3655623eb34d96e5cbb81e2eb635d459ffff0216 Amend LCMS changes for 2.2. 2013-06-29 Andrew John Hughes * acinclude.m4: (IT_ENABLE_ZERO_BUILD): Define once only. * configure.ac: Revert previous change, adding back IT_ENABLE_ZERO_BUILD as this is not invoked by IT_WITH_HOTSPOT_BUILD in 2.2.x. diff -r 3655623eb34d -r c927db268b09 ChangeLog --- a/ChangeLog Sat Jun 29 22:51:53 2013 +0100 +++ b/ChangeLog Sun Jun 30 00:48:09 2013 +0100 @@ -1,3 +1,12 @@ +2013-06-29 Andrew John Hughes + + * acinclude.m4: + (IT_ENABLE_ZERO_BUILD): Define once only. + * configure.ac: Revert previous change, + adding back IT_ENABLE_ZERO_BUILD as this + is not invoked by IT_WITH_HOTSPOT_BUILD in + 2.2.x. + 2013-06-29 Andrew John Hughes * configure.ac: Set to 2.2.9. diff -r 3655623eb34d -r c927db268b09 acinclude.m4 --- a/acinclude.m4 Sat Jun 29 22:51:53 2013 +0100 +++ b/acinclude.m4 Sun Jun 30 00:48:09 2013 +0100 @@ -657,7 +657,7 @@ AC_SUBST([$1]) ]) -AC_DEFUN([IT_ENABLE_ZERO_BUILD], +AC_DEFUN_ONCE([IT_ENABLE_ZERO_BUILD], [ AC_REQUIRE([IT_SET_ARCH_SETTINGS]) AC_MSG_CHECKING([whether to use the zero-assembler port]) diff -r 3655623eb34d -r c927db268b09 configure.ac --- a/configure.ac Sat Jun 29 22:51:53 2013 +0100 +++ b/configure.ac Sun Jun 30 00:48:09 2013 +0100 @@ -139,6 +139,7 @@ IT_DISABLE_OPTIMIZATIONS IT_SET_SHARK_BUILD +IT_ENABLE_ZERO_BUILD IT_CHECK_ADDITIONAL_VMS IT_WITH_VERSION_SUFFIX