From 7ab4b29cd71f9b2c122ca05ca93cd7f30a698e5c Mon Sep 17 00:00:00 2001
From: "cls%seawood.org" <cls%seawood.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 9 Apr 2001 09:38:55 +0000
Subject: [PATCH] Adding initial support for building mozilla with autoconf
 version of NSS. r=bryner

git-svn-id: svn://10.0.0.236/trunk@91738 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/Makefile.in           | 10 +++++-----
 mozilla/config/autoconf.mk.in |  1 +
 mozilla/configure.in          |  5 +++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/mozilla/Makefile.in b/mozilla/Makefile.in
index 8ac361b1d96..08de74d3549 100644
--- a/mozilla/Makefile.in
+++ b/mozilla/Makefile.in
@@ -37,10 +37,6 @@ else
 
 DIRS		= config build
 
-ifdef MOZ_L10N
-DIRS        += l10n
-endif
-
 ifdef MOZ_JAVA_SUPPLEMENT
 DIRS += 			\
   java/util			\
@@ -120,7 +116,7 @@ DIRS		+= \
 		sun-java \
 		profile \
 		themes \
-    	accessible \
+		accessible \
 		$(NULL)
 
 # This must preceed xpfe
@@ -164,6 +160,10 @@ endif # BUILD_MODULES == all
 
 STATIC_MAKEFILES := $(NSPRPUB_DIR) directory/c-sdk/ldap
 
+ifdef MOZ_NSS_AUTOCONF
+STATIC_MAKEFILES += security
+endif
+
 GARBAGE_DIRS += dist
 DIST_GARBAGE = config.cache config.log config.status config-defs.h \
    dependencies.beos config/autoconf.mk config/myrules.mk config/myconfig.mk \
diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in
index 7af74d929f8..66e4a1bf6e5 100644
--- a/mozilla/config/autoconf.mk.in
+++ b/mozilla/config/autoconf.mk.in
@@ -83,6 +83,7 @@ MOZ_ENDER_LITE = @MOZ_ENDER_LITE@
 MOZ_LDAP_XPCOM = @MOZ_LDAP_XPCOM@
 MOZ_LDAP_XPCOM_EXPERIMENTAL = @MOZ_LDAP_XPCOM_EXPERIMENTAL@
 XPCOM_USE_LEA = @XPCOM_USE_LEA@
+MOZ_NSS_AUTOCONF	= @MOZ_NSS_AUTOCONF@
 
 MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS = @MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS@
 MOZ_COMPONENT_NSPR_LIBS=@MOZ_COMPONENT_NSPR_LIBS@
diff --git a/mozilla/configure.in b/mozilla/configure.in
index df8692c1ce4..87e4dcdf988 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -4358,6 +4358,7 @@ AC_SUBST(LIB_SUFFIX)
 AC_SUBST(OBJ_SUFFIX)
 AC_SUBST(BIN_SUFFIX)
 AC_SUBST(USE_N32)
+AC_SUBST(MOZ_NSS_AUTOCONF)
 
 if test "$USING_HCC"; then
    CC='${topsrcdir}/build/hcc'
@@ -4547,3 +4548,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"
+    AC_OUTPUT_SUBDIRS(security)
+fi