No issue - Remove directive 4

This was a control issue way back when. Since this only really relates to
deviating build configs anymore and no longer to critical system libs of note,
there's no point in retaining this overbearing control through build errors.
People have clear instructions how to build - it is their responsibility to
stick to those.

2 files changed, 0 insertions, 89 deletions

diff --git a/build/directive4.py b/build/directive4.py
deleted file mode 100644
index 650349d689..0000000000
--- a/build/directive4.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Imports
-from __future__ import print_function, unicode_literals
-
-import os
-import sys
-
-# Sanity check
-if not len(sys.argv) > 1:
-    print("Incorrect number of arguments")
-    sys.exit(1)
-
-# Vars
-listConfigure = sys.argv[1:]
-listConfig = []
-strBrandingDirectory = ""
-listViolations = []
-
-# Build a list of set configure variables
-for _value in listConfigure:
-    _splitString = _value.split("=")
-
-    if _splitString[1] == "1":
-        listConfig += [ _splitString[0] ]
-    elif _splitString[0] == "MOZ_BRANDING_DIRECTORY":
-        strBrandingDirectory = _splitString[1]
-
-# Only applies if using Official Branding or specific branding directories
-if ('MOZ_OFFICIAL_BRANDING' in listConfig) or (strBrandingDirectory.endswith("branding/official")) or (strBrandingDirectory.endswith("branding/unstable")):
-    # Applies to Pale Moon and Basilisk
-    if ('MC_BASILISK' in listConfig) or ('MC_PALEMOON' in listConfig):
-        listViolations += [
-            'MOZ_SYSTEM_JPEG',
-            'MOZ_SYSTEM_ZLIB',
-            'MOZ_SYSTEM_BZ2',
-            'MOZ_SYSTEM_JEMALLOC'
-        ]
-        
-    # Applies to Pale Moon Only
-    if 'MC_PALEMOON' in listConfig:
-        listViolations += [
-            'MOZ_EME',
-            'MOZ_WEBRTC'
-        ]
-    
-    # Iterate through enabled violations and output 1 to DIRECTIVE4 if any are found
-    for _value in listViolations:
-        if _value in listConfig:
-            sys.stdout.write("1")
-            sys.exit(1)
-
-# Exit outputting nothing to DIRECTIVE4 being empty because there are no violations
-sys.exit(0)
-
-
diff --git a/old-configure.in b/old-configure.in
index 02c3b51865..b9f7842d77 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -5049,37 +5049,6 @@ fi
 
 AC_SUBST(MOZILLA_VERSION)
 
-dnl ========================================================
-dnl Directive 4
-dnl ========================================================
-
-DIRECTIVE4_LIST="
-MOZ_OFFICIAL_BRANDING=$MOZ_OFFICIAL_BRANDING
-MOZ_BRANDING_DIRECTORY=$MOZ_BRANDING_DIRECTORY
-MC_BASILISK=$MC_BASILISK
-MC_PALEMOON=$MC_PALEMOON
-MOZ_EME=$MOZ_EME
-MOZ_WEBRTC=$MOZ_WEBRTC
-MOZ_SYSTEM_JPEG=$MOZ_SYSTEM_JPEG
-MOZ_SYSTEM_ZLIB=$MOZ_SYSTEM_ZLIB
-MOZ_SYSTEM_BZ2=$MOZ_SYSTEM_BZ2
-MOZ_SYSTEM_PNG=$MOZ_SYSTEM_PNG
-MOZ_SYSTEM_LIBVPX=$MOZ_SYSTEM_LIBVPX
-MOZ_SYSTEM_SQLITE=$MOZ_SYSTEM_SQLITE
-MOZ_SYSTEM_JEMALLOC=$MOZ_SYSTEM_JEMALLOC"
-
-DIRECTIVE4=`$PYTHON $_topsrcdir/build/directive4.py $DIRECTIVE4_LIST`
-
-if test -n "$DIRECTIVE4"; then
-    if test -n "$MC_PRIVATE_BUILD"; then
-        AC_MSG_WARN([Private Build - The configuration you have chosen to use with official branding deviates from official build configuration. Your build is thus for personal and private use only and must not be (re)distributed - Please see: http://www.palemoon.org/redist.shtml])
-    else
-        AC_MSG_ERROR([Branding Violation - Please see: http://www.palemoon.org/redist.shtml])
-    fi
-fi
-
-AC_SUBST(DIRECTIVE4)
-
 dnl Spit out some output
 dnl ========================================================