Replaced NO_SECURITY ifdef with MOZ_SECURITY one. This causes pref_VerifyLockFile to always return PR_TRUE rather than linking against the dummy secfree library. This replacement also removed the last dependency upon that dummy library so it will no longer be built (next patch).

extensions/cookie/Makefile.in

@@ -54,7 +54,6 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		$(NSPR_LIBS) \
 		-lxpcom \
-		-lsecfree \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk

extensions/wallet/src/Makefile.in

@@ -52,7 +52,6 @@ CHROME_FILES	= \
 
 EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
-		-lsecfree \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk

modules/libpref/src/Makefile.in

@@ -71,7 +71,6 @@ EXTRA_DSO_LDOPTS = \
 		$(NSPR_LIBS) \
 		-lxpcom \
 		-lmozjs \
-		-lsecfree \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk

modules/libpref/src/prefapi.c

@@ -53,7 +53,7 @@
 #include "prefldap.h"
 #endif
 
-#ifndef NO_SECURITY
+#ifdef MOZ_SECURITY
 #include "sechash.h"
 #endif
 #include "plstr.h"
@@ -292,7 +292,7 @@ PrefResult pref_OpenFile(
    where each 'xx' is a hex value. */
 PRBool pref_VerifyLockFile(char* buf, long buflen)
 {
-#ifndef NO_SECURITY
+#ifdef MOZ_SECURITY
 	PRBool success = PR_FALSE;
 	const int obscure_value = 7;
 	const long hash_length = 51;		/* len = 48 chars of MD5 + // + EOL */

modules/libpref/src/prefapi.cpp

@@ -53,7 +53,7 @@
 #include "prefldap.h"
 #endif
 
-#ifndef NO_SECURITY
+#ifdef MOZ_SECURITY
 #include "sechash.h"
 #endif
 #include "plstr.h"
@@ -292,7 +292,7 @@ PrefResult pref_OpenFile(
    where each 'xx' is a hex value. */
 PRBool pref_VerifyLockFile(char* buf, long buflen)
 {
-#ifndef NO_SECURITY
+#ifdef MOZ_SECURITY
 	PRBool success = PR_FALSE;
 	const int obscure_value = 7;
 	const long hash_length = 51;		/* len = 48 chars of MD5 + // + EOL */

netwerk/cache/tests/xptest/Makefile.in

@@ -1,50 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-CPPSRCS		= \
-		disktest.cpp \
-		memtest.cpp \
-		$(NULL)
-
-SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
-
-LIBS		= \
-		-lpref \
-		-lsecfree \
-		-lmozjs \
-		-lxpcom \
-		$(ZLIB_LIBS) \
-		$(NSPR_LIBS) \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES		+= -DUSE_NSREG -DCACHE
-LIBS_DIR 	+= -L$(DIST)/bin/components
-INCLUDES	+= -I$(srcdir)/../../public -I$(srcdir)/../../include -I..
-