# HG changeset patch
# User Mike Hommey <mh+mozilla@glandium.org>
# Date 1547474363 0
# Node ID 9386709aeec02c6706fadc49d7e4f7c63c73203f
# Parent  e44a152c9f9f2859751dd43dc6ac057f643b70d0
Bug 1519603 - Remove unused autoconf macros. r=froydnj

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

diff --git a/build/autoconf/acwinpaths.m4 b/build/autoconf/acwinpaths.m4
--- a/build/autoconf/acwinpaths.m4
+++ b/build/autoconf/acwinpaths.m4
@@ -1,31 +1,10 @@
 dnl This Source Code Form is subject to the terms of the Mozilla Public
 dnl License, v. 2.0. If a copy of the MPL was not distributed with this
 dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-define(GENERATE_SUB_ABS, [
-define([AC_OUTPUT_FILES_SUB1], [
-patsubst($@, [/\*)], [/* | ?:/*)])
-])
-])
-GENERATE_SUB_ABS(defn([AC_OUTPUT_FILES]))
-
-define(GENERATE_SUB_NOSPLIT, [
-define([AC_OUTPUT_FILES], [
-patsubst($@, [-e "s%:% \$ac_given_srcdir/%g"], [])
-])
-])
-GENERATE_SUB_NOSPLIT(defn([AC_OUTPUT_FILES_SUB1]))
-
-define(GENERATE_HEADER_NOSPLIT, [
-define([AC_OUTPUT_HEADER], [
-patsubst($@, [-e "s%:% \$ac_given_srcdir/%g"], [])
-])
-])
-GENERATE_HEADER_NOSPLIT(defn([AC_OUTPUT_HEADER]))
-
 define(GENERATE_SUBDIRS_ABS, [
 define([AC_OUTPUT_SUBDIRS], [
 patsubst($@, [/\*)], [/* | ?:/*)])
 ])
 ])
 GENERATE_SUBDIRS_ABS(defn([AC_OUTPUT_SUBDIRS]))
diff --git a/build/autoconf/altoptions.m4 b/build/autoconf/altoptions.m4
--- a/build/autoconf/altoptions.m4
+++ b/build/autoconf/altoptions.m4
@@ -8,19 +8,17 @@ dnl    This file also includes the macro
 dnl    the 'myconfig.m4' file.
 
 dnl Send comments, improvements, bugs to Steve Lamm (slamm@netscape.com).
 
 
 dnl MOZ_ARG_ENABLE_BOOL(           NAME, HELP, IF-YES [, IF-NO [, ELSE]])
 dnl MOZ_ARG_DISABLE_BOOL(          NAME, HELP, IF-NO [, IF-YES [, ELSE]])
 dnl MOZ_ARG_ENABLE_STRING(         NAME, HELP, IF-SET [, ELSE])
-dnl MOZ_ARG_ENABLE_BOOL_OR_STRING( NAME, HELP, IF-YES, IF-NO, IF-SET[, ELSE]]])
 dnl MOZ_ARG_WITH_BOOL(             NAME, HELP, IF-YES [, IF-NO [, ELSE])
-dnl MOZ_ARG_WITHOUT_BOOL(          NAME, HELP, IF-NO [, IF-YES [, ELSE])
 dnl MOZ_ARG_WITH_STRING(           NAME, HELP, IF-SET [, ELSE])
 dnl MOZ_ARG_HEADER(Comment)
 dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file
 
 define([MOZ_DIVERSION_ARGS], 12)
 
 AC_DEFUN([MOZ_ARG],[dnl
 AC_DIVERT_PUSH(MOZ_DIVERSION_ARGS)dnl
@@ -53,38 +51,22 @@ AC_DEFUN([MOZ_ARG_DISABLE_BOOL],
 [MOZ_AC_ARG_ENABLE([$1], [$2],
  [MOZ_TWO_STRING_TEST([$1], [$enableval], no, [$3], yes, [$4])],
  [$5])])
 
 dnl MOZ_ARG_ENABLE_STRING(NAME, HELP, IF-SET [, ELSE])
 AC_DEFUN([MOZ_ARG_ENABLE_STRING],
 [MOZ_AC_ARG_ENABLE([$1], [$2], [$3], [$4])])
 
-dnl MOZ_ARG_ENABLE_BOOL_OR_STRING(NAME, HELP, IF-YES, IF-NO, IF-SET[, ELSE]]])
-AC_DEFUN([MOZ_ARG_ENABLE_BOOL_OR_STRING],
-[ifelse([$5], , 
- [errprint([Option, $1, needs an "IF-SET" argument.
-])
-  m4exit(1)],
- [MOZ_AC_ARG_ENABLE([$1], [$2],
-  [MOZ_TWO_STRING_TEST([$1], [$enableval], yes, [$3], no, [$4], [$5])],
-  [$6])])])
-
 dnl MOZ_ARG_WITH_BOOL(NAME, HELP, IF-YES [, IF-NO [, ELSE])
 AC_DEFUN([MOZ_ARG_WITH_BOOL],
 [MOZ_AC_ARG_WITH([$1], [$2],
  [MOZ_TWO_STRING_TEST([$1], [$withval], yes, [$3], no, [$4])],
  [$5])])
 
-dnl MOZ_ARG_WITHOUT_BOOL(NAME, HELP, IF-NO [, IF-YES [, ELSE])
-AC_DEFUN([MOZ_ARG_WITHOUT_BOOL],
-[MOZ_AC_ARG_WITH([$1], [$2],
- [MOZ_TWO_STRING_TEST([$1], [$withval], no, [$3], yes, [$4])],
- [$5])])
-
 dnl MOZ_ARG_WITH_STRING(NAME, HELP, IF-SET [, ELSE])
 AC_DEFUN([MOZ_ARG_WITH_STRING],
 [MOZ_AC_ARG_WITH([$1], [$2], [$3], [$4])])
 
 dnl MOZ_ARG_HEADER(Comment)
 dnl This is used by webconfig to group options
 define(MOZ_ARG_HEADER, [# $1])