Add support for building PSM from the nss autoconf branch using --enable-crypto. Remove references to obsolete MOZ_SECURITY define. r=cls.

Makefile.in

@@ -130,6 +130,10 @@ endif
 
 DIRS		+= xpinstall
 
+ifdef MOZ_PSM
+DIRS		+= security security/manager
+endif
+
 ifdef MOZ_EXTENSIONS
 DIRS		+= extensions
 endif

config/autoconf.mk.in

@@ -47,7 +47,6 @@ MOZ_WIDGET_SUPPORT_LIBS    = $(DIST)/lib/libwidgetsupport_s.$(LIB_SUFFIX)
 MOZ_GFX_TOOLKIT_LDFLAGS     = @MOZ_GFX_TOOLKIT_LDFLAGS@
 MOZ_WIDGET_TOOLKIT_LDFLAGS  = @MOZ_WIDGET_TOOLKIT_LDFLAGS@
 
-MOZ_SECURITY 	= @MOZ_SECURITY@
 MOZ_DEBUG	= @MOZ_DEBUG@
 MOZ_DEBUG_MODULES = @MOZ_DEBUG_MODULES@
 MOZ_PROFILE_MODULES = @MOZ_PROFILE_MODULES@
@@ -342,3 +341,4 @@ USE_IMG2=@USE_IMG2@
 HAVE_GDK_PIXBUF=@HAVE_GDK_PIXBUF@
 HAVE_XIE=@HAVE_XIE@
 
+MOZ_PSM=@MOZ_PSM@

config/config.mk

@@ -432,10 +432,6 @@ ifdef MOZ_DEBUG
 DEFINES		+= -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP
 endif
 
-ifdef MOZ_SECURITY
-DEFINES		+= -DMOZ_SECURITY
-endif
-
 #
 # Platform dependent switching off of JAVA
 #

configure.in

@@ -3382,6 +3382,22 @@ MOZ_ARG_WITH_STRING(dbgrinfo-modules,
     done ])
 dnl ========================================================
 
+dnl ========================================================
+dnl =
+dnl = --enable-crypto
+dnl =
+dnl = Build Personal Security Manager
+dnl =
+dnl ========================================================
+MOZ_PSM=
+
+MOZ_ARG_ENABLE_BOOL(crypto,
+[  --enable-crypto         Enable crypto (Personal Security Manager)],
+  [if test -z "$MOZ_NSS_AUTOCONF"; then
+    AC_MSG_ERROR(["To use NSS autoconf you must set MOZ_NSS_AUTOCONF=1 in your environment."])
+   fi
+  MOZ_PSM=1] )
+
 dnl ========================================================
 dnl =
 dnl = --with-extensions=extension1,extension2,
@@ -3980,7 +3996,7 @@ AC_SUBST(MOZ_SVG)
 AC_SUBST(MOZ_XSL)
 AC_SUBST(MOZ_MONOLITHIC_TOOLKIT)
 AC_SUBST(MOZ_JS_LIBS)
-AC_SUBST(MOZ_SECURITY)
+AC_SUBST(MOZ_PSM)
 AC_SUBST(BUILD_MODULES)
 AC_SUBST(MOZ_DEBUG)
 AC_SUBST(MOZ_DEBUG_MODULES)
@@ -4551,7 +4567,7 @@ if test "$MOZ_LDAP_XPCOM"; then
   AC_OUTPUT_SUBDIRS(directory/c-sdk/ldap)
 fi
 
-if test "$MOZ_NSS_AUTOCONF"; then
-    ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
+if test "$MOZ_PSM"; then
+    ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla --disable-cmd"
     AC_OUTPUT_SUBDIRS(security)
 fi