From e0c70cb495df6b8c48cb61f595f3b24ad8bc2f4a Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Sun, 8 May 2022 16:48:06 -0400 Subject: Remove references to DBM --- confvars.sh | 1 + installer/Makefile.in | 6 +----- installer/package-manifest.in | 3 --- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/confvars.sh b/confvars.sh index 360dc54..1f5cf07 100755 --- a/confvars.sh +++ b/confvars.sh @@ -9,6 +9,7 @@ MOZ_PHOENIX=1 MOZ_AUSTRALIS=1 HYPE_ICEWEASEL=1 MOZ_UPDATER=0 +MOZ_SECURITY_SQLSTORE=1 if test "$OS_ARCH" = "WINNT" -o \ "$OS_ARCH" = "Linux"; then diff --git a/installer/Makefile.in b/installer/Makefile.in index 2d5a5f9..e826f16 100644 --- a/installer/Makefile.in +++ b/installer/Makefile.in @@ -42,10 +42,6 @@ ifdef MOZ_SYSTEM_NSS DEFINES += -DMOZ_SYSTEM_NSS=1 endif -ifdef NSS_DISABLE_DBM -DEFINES += -DNSS_DISABLE_DBM=1 -endif - ifdef MOZ_ARTIFACT_BUILDS DEFINES += -DMOZ_ARTIFACT_BUILDS=1 endif @@ -172,4 +168,4 @@ package-compare:: installer:: ifdef INSTALLER_DIR $(MAKE) -C $(INSTALLER_DIR) -endif \ No newline at end of file +endif diff --git a/installer/package-manifest.in b/installer/package-manifest.in index 7b27406..c361e63 100644 --- a/installer/package-manifest.in +++ b/installer/package-manifest.in @@ -631,9 +631,6 @@ #endif @BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@ -#ifndef NSS_DISABLE_DBM -@BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@ -#endif #ifndef MOZ_FOLD_LIBS @BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@ -- cgit v1.2.3