From f47fd953a2c773013f6766120d53512623466af6 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Fri, 11 Jan 2019 05:02:07 +0000
Subject: [PATCH] Bug 1519281 - Remove leftovers from bug 1490765. r=nalexander

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

--HG--
extra : moz-landing-system : lando
---
 build/autoconf/hooks.m4        | 12 +--------
 build/autoconf/subconfigure.m4 | 46 ----------------------------------
 build/subconfigure.py          |  5 ----
 old-configure.in               | 11 --------
 4 files changed, 1 insertion(+), 73 deletions(-)
 delete mode 100644 build/autoconf/subconfigure.m4

diff --git a/build/autoconf/hooks.m4 b/build/autoconf/hooks.m4
index 5c921b549e18..de2ab925b268 100644
--- a/build/autoconf/hooks.m4
+++ b/build/autoconf/hooks.m4
@@ -12,7 +12,6 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
 > subconfigures
-> skip_subconfigures
 ])
 
 define([AC_OUTPUT_SUBDIRS],
@@ -54,15 +53,6 @@ define([AC_OUTPUT_SUBDIRS],
 done
 ])
 
-define([AC_OUTPUT_SUBDIRS_NOW],
-[
-for moz_config_dir_ in $1; do
-  AC_OUTPUT_SUBDIRS($moz_config_dir_,$2)
-  tail -1 subconfigures >> skip_subconfigures
-  MOZ_RUN_SUBCONFIGURES(`tail -1 skip_subconfigures`)
-done
-])
-
 define([MOZ_RUN_SUBCONFIGURES],
 [dnl Execute subconfigure, unless --no-recursion was passed to configure.
 if test "$no_recursion" != yes; then
@@ -74,7 +64,7 @@ fi
 ])
 
 define([MOZ_RUN_ALL_SUBCONFIGURES],[
-MOZ_RUN_SUBCONFIGURES([--list subconfigures --skip skip_subconfigures])
+MOZ_RUN_SUBCONFIGURES([--list subconfigures])
 ])
 
 dnl Print error messages in config.log as well as stderr
diff --git a/build/autoconf/subconfigure.m4 b/build/autoconf/subconfigure.m4
deleted file mode 100644
index 8e95e014e27f..000000000000
--- a/build/autoconf/subconfigure.m4
+++ /dev/null
@@ -1,46 +0,0 @@
-dnl We are not running in a real autoconf environment. So we're using real m4
-dnl here, not the crazier environment that autoconf provides.
-
-dnl Autoconf expects [] for quotes; give it to them
-changequote([, ])
-
-dnl AC_DEFUN is provided to use instead of define in autoconf. Provide it too.
-define([AC_DEFUN], [define($1, [$2])])
-
-dnl AC_ARG_ENABLE(FEATURE, HELP-STRING, IF-TRUE[, IF-FALSE])
-dnl We have to ignore the help string due to how help works in autoconf...
-AC_DEFUN([MOZ_AC_ARG_ENABLE],
-[#] Check whether --enable-[$1] or --disable-[$1] was given.
-[if test "[${enable_]patsubst([$1], -, _)+set}" = set; then
-  enableval="[$enable_]patsubst([$1], -, _)"
-  $3
-ifelse([$4], , , [else
-  $4
-])dnl
-fi
-])
-
-dnl AC_MSG_ERROR(error-description)
-AC_DEFUN([AC_MSG_ERROR], [{ echo "configure: error: $1" 1>&2; exit 1; }])
-
-AC_DEFUN([AC_MSG_WARN],  [ echo "configure: warning: $1" 1>&2 ])
-
-dnl Add the variable to the list of substitution variables
-AC_DEFUN([AC_SUBST],
-[
-_subconfigure_ac_subst_args="$_subconfigure_ac_subst_args $1"
-])
-
-dnl Override for AC_DEFINE.
-AC_DEFUN([AC_DEFINE],
-[
-cat >>confdefs.h <<\EOF
-[#define] $1 ifelse($#, 2, [$2], $#, 3, [$2], 1)
-EOF
-cat >> confdefs.pytmp <<\EOF
-    (''' $1 ''', ifelse($#, 2, [r''' $2 '''], $#, 3, [r''' $2 '''], ' 1 '))
-EOF
-])
-
-dnl AC_OUTPUT_SUBDIRS(subdirectory)
-AC_DEFUN([AC_OUTPUT_SUBDIRS], [do_output_subdirs "$1"])
diff --git a/build/subconfigure.py b/build/subconfigure.py
index 9c18ab7e3177..40567f315bd8 100644
--- a/build/subconfigure.py
+++ b/build/subconfigure.py
@@ -382,17 +382,12 @@ def subconfigure(args):
     parser = argparse.ArgumentParser()
     parser.add_argument('--list', type=str,
                         help='File containing a list of subconfigures to run')
-    parser.add_argument('--skip', type=str,
-                        help='File containing a list of Subconfigures to skip')
     parser.add_argument('subconfigures', type=str, nargs='*',
                         help='Subconfigures to run if no list file is given')
     args, others = parser.parse_known_args(args)
     subconfigures = args.subconfigures
     if args.list:
         subconfigures.extend(open(args.list, 'rb').read().splitlines())
-    if args.skip:
-        skips = set(open(args.skip, 'rb').read().splitlines())
-        subconfigures = [s for s in subconfigures if s not in skips]
 
     if not subconfigures:
         return 0
diff --git a/old-configure.in b/old-configure.in
index 5a1d1e598752..d22710c786a1 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -3849,17 +3849,6 @@ fi
 unset MAKEFILES
 unset CONFIG_FILES
 
-# Run all configure scripts specified by a subconfigure
-if test -n "$_subconfigure_subdir"; then
-  _save_srcdir="$srcdir"
-  srcdir="$srcdir/.."
-  _save_ac_configure_args="$ac_configure_args"
-  ac_configure_args="$_subconfigure_config_args"
-  AC_OUTPUT_SUBDIRS_NOW("$_subconfigure_subdir",$cache_file)
-  ac_configure_args="$_save_ac_configure_args"
-  srcdir="$_save_srcdir"
-fi
-
 if test "$COMPILE_ENVIRONMENT" -a "$MOZ_WIDGET_TOOLKIT"; then