Bug 1760623 - Remove --enable-openpgp configure option. r=kaie

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

--HG--
extra : amend_source : 7f7cf3ef83c6554b321b8405862ce72dd561712c

mail/extensions/moz.build

@@ -12,9 +12,5 @@ DIRS += [
 
 DIRS += [
     "am-e2e",
+    "openpgp",
 ]
-
-if CONFIG["MOZ_OPENPGP"]:
-    DIRS += [
-        "openpgp",
-    ]

mail/installer/package-manifest.in

@@ -240,13 +240,11 @@
 #endif
 
 ; OpenPGP (librnp)
-#ifdef MOZ_OPENPGP
 #ifdef MZLA_LIBRNP
 @BINPATH@/@DLL_PREFIX@rnp@DLL_SUFFIX@
 @BINPATH@/rnp-cli@BIN_SUFFIX@
 @BINPATH@/rnpkeys@BIN_SUFFIX@
 #endif
-#endif
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Chrome Files
@@ -289,10 +287,8 @@
 ; App extensions to Mail
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-#ifdef MOZ_OPENPGP
 @RESPATH@/chrome/openpgp@JAREXT@
 @RESPATH@/chrome/openpgp.manifest
-#endif
 
 ; misson control, autoconfig
 #ifdef MOZ_PREF_EXTENSIONS

mailnews/moz.configure

@@ -20,22 +20,7 @@ set_config("MOZ_MAPI_SUPPORT", mapi_support)
 set_define("MOZ_MAPI_SUPPORT", mapi_support)
 
 # =========================================================
-# = Experimental OpenPGP integration
+# = OpenPGP integration
 # =========================================================
 
-option(
-    "--enable-openpgp",
-    default=True,
-    help="Enable building of the Experimental OpenPGP integration",
-)
-
-
-@depends_if("--enable-openpgp")
-def openpgp(arg):
-    return True
-
-
-set_config("MOZ_OPENPGP", openpgp)
-set_define("MOZ_OPENPGP", openpgp)
-
-include("../third_party/openpgp.configure", when="--enable-openpgp")
+include("../third_party/openpgp.configure")

third_party/moz.build

@@ -9,7 +9,7 @@ if CONFIG["TB_LIBOTR_PREBUILT"]:
     if CONFIG["HAVE_64BIT_BUILD"]:
         DEFINES["HAVE_64BIT_BUILD"] = True
 
-if CONFIG["MOZ_OPENPGP"] and CONFIG["MZLA_LIBRNP"]:
+if CONFIG["MZLA_LIBRNP"]:
     DIRS += [
         "botan",
         "bzip2",