[tor-commits] [tor-browser-build/master] Bug 34391: Remove unused --enable-signmar option

[sysrqb at torproject.org]

commit 83772c1776809b853e686773c18ccb76a7edfd49
Author: Georg Koppen <gk at torproject.org>
Date:   Sun Jun 14 21:42:28 2020 +0000

    Bug 34391: Remove unused --enable-signmar option
    
    The --enable-signmar option is gone with
    https://bugzilla.mozilla.org/show_bug.cgi?id=1562952. The signmar tool
    is always built now.
---
 projects/firefox/mozconfig-linux-i686     | 3 +--
 projects/firefox/mozconfig-linux-x86_64   | 1 -
 projects/firefox/mozconfig-osx-x86_64     | 3 +--
 projects/firefox/mozconfig-windows-i686   | 1 -
 projects/firefox/mozconfig-windows-x86_64 | 1 -
 5 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686
index 87b64d7..3ea241f 100755
--- a/projects/firefox/mozconfig-linux-i686
+++ b/projects/firefox/mozconfig-linux-i686
@@ -23,7 +23,6 @@ ac_add_options --enable-official-branding
 ac_add_options --enable-default-toolkit=cairo-gtk3
 
 ac_add_options --enable-tor-browser-update
-ac_add_options --enable-signmar
 ac_add_options --enable-verify-mar
 
 ac_add_options --disable-tests
@@ -38,4 +37,4 @@ ac_add_options --enable-proxy-bypass-protection
 ac_add_options --disable-debug-symbols
 
 # Disable telemetry
-ac_add_options MOZ_TELEMETRY_REPORTING=
\ No newline at end of file
+ac_add_options MOZ_TELEMETRY_REPORTING=
diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64
index 59517cd..e4d2b99 100755
--- a/projects/firefox/mozconfig-linux-x86_64
+++ b/projects/firefox/mozconfig-linux-x86_64
@@ -21,7 +21,6 @@ ac_add_options --enable-official-branding
 ac_add_options --enable-default-toolkit=cairo-gtk3
 
 ac_add_options --enable-tor-browser-update
-ac_add_options --enable-signmar
 ac_add_options --enable-verify-mar
 
 ac_add_options --disable-strip
diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64
index 8fa7885..8f088a5 100644
--- a/projects/firefox/mozconfig-osx-x86_64
+++ b/projects/firefox/mozconfig-osx-x86_64
@@ -37,7 +37,6 @@ ac_add_options --disable-debug
 
 ac_add_options --enable-tor-browser-data-outside-app-dir
 ac_add_options --enable-tor-browser-update
-ac_add_options --enable-signmar
 ac_add_options --enable-verify-mar
 
 ac_add_options --disable-crashreporter
@@ -48,4 +47,4 @@ ac_add_options --disable-eme
 ac_add_options --enable-proxy-bypass-protection
 
 # Disable telemetry
-ac_add_options MOZ_TELEMETRY_REPORTING=
\ No newline at end of file
+ac_add_options MOZ_TELEMETRY_REPORTING=
diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686
index 4fd9958..8cb2850 100644
--- a/projects/firefox/mozconfig-windows-i686
+++ b/projects/firefox/mozconfig-windows-i686
@@ -27,7 +27,6 @@ ac_add_options --enable-strip
 ac_add_options --enable-official-branding
 
 ac_add_options --enable-tor-browser-update
-ac_add_options --enable-signmar
 ac_add_options --enable-verify-mar
 ac_add_options --disable-bits-download
 
diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64
index ae5cf67..d35dc18 100644
--- a/projects/firefox/mozconfig-windows-x86_64
+++ b/projects/firefox/mozconfig-windows-x86_64
@@ -27,7 +27,6 @@ ac_add_options --enable-strip
 ac_add_options --enable-official-branding
 
 ac_add_options --enable-tor-browser-update
-ac_add_options --enable-signmar
 ac_add_options --enable-verify-mar
 ac_add_options --disable-bits-download