Bug 1341234 - part 0 - fix typo in AC_SUBST_SET checking; r=gps
authorNathan Froyd <froydnj@mozilla.com>
Fri, 10 Nov 2017 10:05:36 -0500
changeset 444454 1721ccb0d0d653e39acd11111f495ebe9308f1e2
parent 444453 c69e6ac63826176ea18339a44e7297164dd8a335
child 444455 9b5adaaf61560f94ed59ed689bcac7bb4d533967
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1341234
milestone58.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1341234 - part 0 - fix typo in AC_SUBST_SET checking; r=gps The various AC_SUBST macros generate AC_SUBST_*FOO macros for holding the values to substitute. The macros also cross-check the AC_SUBST_* macros generated by other variants to make sure that you don't try to do something like AC_SUBST(FOO) and AC_SUBST_SET(FOO). However, the check in AC_SUBST_SET for AC_SUBST_LIST duplicate is missing an underscore: the AC_SUBST_LIST macro generates another macro starting with AC_SUBST_LIST_, but the AC_SUBST_SET macro checks for the prefix AC_SUBST_LIST, which is missing the trailing underscore. As we're going to be adding yet another AC_SUBST_* macro variant, and therefore adding more checks to all existing macros, let's clean this up before we start.
build/autoconf/config.status.m4
--- a/build/autoconf/config.status.m4
+++ b/build/autoconf/config.status.m4
@@ -19,17 +19,17 @@ AC_DIVERT_PUSH(MOZ_DIVERSION_SUBST)dnl
 AC_DIVERT_POP()dnl
 ])])])])
 
 dnl Like AC_SUBST, but makes the value available as a set in python,
 dnl with values got from the value of the environment variable, split on
 dnl whitespaces.
 define([AC_SUBST_SET],
 [ifdef([AC_SUBST_$1], [m4_fatal([Cannot use AC_SUBST and AC_SUBST_SET on the same variable ($1)])],
-[ifdef([AC_SUBST_LIST$1], [m4_fatal([Cannot use AC_SUBST_LIST and AC_SUBST_SET on the same variable ($1)])],
+[ifdef([AC_SUBST_LIST_$1], [m4_fatal([Cannot use AC_SUBST_LIST and AC_SUBST_SET on the same variable ($1)])],
 [ifdef([AC_SUBST_SET_$1], ,
 [define([AC_SUBST_SET_$1], )dnl
 AC_DIVERT_PUSH(MOZ_DIVERSION_SUBST)dnl
     (''' $1 ''', unique_list(split(r''' [$]$1 ''')))
 AC_DIVERT_POP()dnl
 ])])])])
 
 dnl Like AC_SUBST, but makes the value available as a list in python,