Bug 1912993 - Remove reference to autoconfmk in js/src/old-configure.in r=glandium

And accordingly remove reference to autoconfmk now that it's no longer
parametric.

Differential Revision: https://phabricator.services.mozilla.com/D219115

config/autoconf-js.mk.in

@@ -1,6 +0,0 @@
-ifndef INCLUDED_AUTOCONF_MK
-INCLUDED_AUTOCONF_MK = autoconf-js.mk
-include $(DEPTH)/config/emptyvars-js.mk
-@ALLSUBSTS@
-include $(topsrcdir)/config/baseconfig.mk
-endif

config/emptyvars-js.mk.in

@@ -1 +0,0 @@
-@ALLEMPTYSUBSTS@

js/src/moz.build

@@ -93,12 +93,6 @@ CONFIGURE_DEFINE_FILES += [
     "js-confdefs.h",
 ]
 
-if not CONFIG["JS_STANDALONE"]:
-    CONFIGURE_SUBST_FILES += [
-        "../../config/autoconf-js.mk",
-        "../../config/emptyvars-js.mk",
-    ]
-
 CONFIGURE_DEFINE_FILES += [
     "js-config.h",
 ]

js/src/old-configure.in

@@ -11,11 +11,6 @@ AC_INIT(js/src/jsapi.h)
 AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
 AC_CANONICAL_SYSTEM
 
-if test -z "$JS_STANDALONE"; then
-  autoconfmk=autoconf-js.mk
-fi
-AC_SUBST(autoconfmk)
-
 dnl ========================================================
 dnl =
 dnl = Maintainer debug option (no --enable equivalent)

python/mozbuild/mozbuild/backend/recursivemake.py

@@ -1768,8 +1768,6 @@ class RecursiveMakeBackend(MakeBackend):
         with self._get_preprocessor(obj) as pp:
             if extra:
                 pp.context.update(extra)
-            if not pp.context.get("autoconfmk", ""):
-                pp.context["autoconfmk"] = "autoconf.mk"
             pp.handleLine(
                 "# THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT MODIFY BY HAND.\n"
             )
@@ -1779,7 +1777,7 @@ class RecursiveMakeBackend(MakeBackend):
             pp.handleLine("srcdir := @srcdir@\n")
             pp.handleLine("srcdir_rel := @srcdir_rel@\n")
             pp.handleLine("relativesrcdir := @relativesrcdir@\n")
-            pp.handleLine("include $(DEPTH)/config/@autoconfmk@\n")
+            pp.handleLine("include $(DEPTH)/config/autoconf.mk\n")
             if not stub:
                 pp.do_include(obj.input_path)
             # Empty line to avoid failures when last line in Makefile.in ends