There are various things in autoconf.mk.in that make it not very easily autogenerated: - ifdefs - variable definitions involving over variables (FOO = $(BAR) @FOO@) - variable name mismatch (FOO = @BAR@)

This addresses most of comment 0. The remaining lines need to move to a separate file that autoconf.mk would include, because they need to be included first (config/config.mk is included too late). That will be done in a separate patch. Testing on try: https://tbpl.mozilla.org/?tree=Try&rev=41178e9555c6

Comment on attachment 632286 [details] [diff] [review] Normalize autoconf.mk.in Breaks b2g :(

After all, I folded what I intended to be two patches. This is going through try: https://tbpl.mozilla.org/?tree=Try&rev=abe247d8ba81 The previous B2G breakage was due to bug 764046, so this patch depends on that bug.

Last one failed mac universal build. https://tbpl.mozilla.org/?tree=Try&rev=ebb5a7ce747e

Forgot to change a few SYSTEM_MAKEDEPEND.

Comment on attachment 632601 [details] [diff] [review] Normalize autoconf.mk.in Review of attachment 632601 [details] [diff] [review]: ----------------------------------------------------------------- ::: build/macosx/js-icc-flight.mk @@ -1,1 @@ > # This Source Code Form is subject to the terms of the Mozilla Public You could just hg rm this file honestly. It's never going to be used. ::: config/baseconfig.mk @@ +2,5 @@ > + > +includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) > +idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) > +installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) > +sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) Do you want to just format these variables in configure instead? ::: config/config.mk @@ +55,5 @@ > space :=$(nullstr) # EOL > > core_winabspath = $(firstword $(subst /, ,$(call core_abspath,$(1)))):$(subst $(space),,$(patsubst %,\\%,$(wordlist 2,$(words $(subst /, ,$(call core_abspath,$(1)))), $(strip $(subst /, ,$(call core_abspath,$(1))))))) > > +RM = rm -f I don't think this is actually necessary, since both gmake and pymake define this. ::: configure.in @@ +4193,5 @@ > else > + AC_CHECK_LIB(png, png_get_valid, [MOZ_NATIVE_PNG=1 MOZ_PNG_LIBS="-lpng"], > + AC_MSG_ERROR([--with-system-png requested but no working libpng found])) > +# AC_CHECK_LIB(png, png_get_acTL, , > +# AC_MSG_ERROR([--with-system-png won't work because the system's libpng doesn't have APNG support])) I would guess you don't actually want to leave this commented out. (Just for testing?)

(In reply to Ted Mielczarek [:ted] from comment #6) > ::: config/baseconfig.mk > @@ +2,5 @@ > > + > > +includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) > > +idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) > > +installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) > > +sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) > > Do you want to just format these variables in configure instead? I'm not sure. Let's do that in a followup if that's worthwhile. > ::: configure.in > @@ +4193,5 @@ > > else > > + AC_CHECK_LIB(png, png_get_valid, [MOZ_NATIVE_PNG=1 MOZ_PNG_LIBS="-lpng"], > > + AC_MSG_ERROR([--with-system-png requested but no working libpng found])) > > +# AC_CHECK_LIB(png, png_get_acTL, , > > +# AC_MSG_ERROR([--with-system-png won't work because the system's libpng doesn't have APNG support])) > > I would guess you don't actually want to leave this commented out. (Just for > testing?) Oops :)

Fixup: https://hg.mozilla.org/integration/mozilla-inbound/rev/25b914405558

Backed out https://hg.mozilla.org/integration/mozilla-inbound/rev/e96cc844629d

This should fix the jsreftest bustage I got when landing.

Folded both patches when landing: https://hg.mozilla.org/integration/mozilla-inbound/rev/5409a2426f99

Fixup to make pymake happy: https://hg.mozilla.org/integration/mozilla-inbound/rev/9349fc366071