Update nspr environment config and override as discussed with the NSPR team.

allmakefiles.sh

@@ -50,7 +50,8 @@ base/src/xlib/Makefile
 base/tests/Makefile
 build/Makefile
 build/unix/Makefile
-build/unix/nsprenv.mk
+build/unix/nspr_my_config.mk
+build/unix/nspr_my_overrides.mk
 build/package/rpm/mozilla.spec
 build/package/rpm/nspr-pthreads.spec
 config/Makefile

build/unix/.cvsignore

@@ -1,2 +1,3 @@
 Makefile
-nsprenv.mk
+nspr_my_config.mk
+nspr_my_overrides.mk

build/unix/nspr_my_config.mk.in

@@ -4,4 +4,3 @@ NS_USE_GCC=@MOZ_NSPRENV_NS_USE_GCC@
 NO_MDUPDATE=@MOZ_NSPRENV_NO_MDUPDATE@
 NS_USE_NATIVE=@MOZ_NSPRENV_NS_USE_NATIVE@
 MOZILLA_CLIENT=@MOZ_NSPRENV_MOZILLA_CLIENT@
-DIST=@MOZ_NSPRENV_DIST@

build/unix/nspr_my_overrides.mk.in

@@ -0,0 +1 @@
+DIST=@MOZ_NSPRENV_DIST@

configure.in

@@ -1736,25 +1736,33 @@ dnl ========================================================
 
 dnl ========================================================
 dnl =
-dnl = build/unix/nsprenv.mk support
+dnl = Support for feeding NSPR environment variabled via
+dnl = a file as opposed to the environment itself.
+dnl = 
+dnl = The following 2 files get generated by configure and
+dnl = copied into
+dnl = 
+dnl = build/unix/nspr_my_config.mk support
+dnl = build/unix/nspr_my_override.mk support
+dnl = 
+dnl = nsprpub/config 
+dnl = 
+dnl = NSPR will then include these files in its build environment.
 dnl = 
-dnl = NSPR does not use autoconf.  However, it support reading
-dnl = environment from a file.  That is what build/unix/nsprenv.mk
-dnl = does.  It is generated from builds/unix/nsprenv.mk.in.
-dnl =
-dnl = This file is them copied to nsprpub/config/myconfig.mk
-dnl =
-dnl = NSPR will then include that file in its build system.
-dnl =
 dnl = The following variables might need to be set to properly
 dnl = build NSPR for unix:
 dnl = 
+dnl = my_config.mk:
+dnl = 
 dnl = USE_PTHREADS
 dnl = BUILD_OPT
 dnl = NS_USE_GCC
 dnl = NO_MDUPDATE
 dnl = NS_USE_NATIVE
 dnl = MOZILLA_CLIENT
+dnl = 
+dnl = my_overrides.mk:
+dnl = 
 dnl = DIST
 dnl = 
 dnl ========================================================
@@ -1871,17 +1879,20 @@ AC_OUTPUT($MAKEFILES)
 
 dnl ========================================================
 dnl = 
-dnl = If is not native, copy build/unix/nsprenv.mk to 
-dnl = nsprpub/config/myconfig.mk, so that NSPR will be 
-dnl = built with the same options as mozilla.
+dnl = If we are building NSPR as part of the build, make sure 
+dnl = the NSPR environment config and override files get copied
+dnl = to the right place.
 dnl = 
 dnl ========================================================
 
-dnl 
-dnl XXX commented out pending nspr checkin
-dnl 
+dnl
+dnl XXX commented out pending NSPR checkin
+dnl
+
 dnl if test ! "$MOZ_NATIVE_NSPR"
 dnl then
-dnl   rm -f nsprpub/config/myconfig.mk
-dnl   cp build/unix/nsprenv.mk nsprpub/config/myconfig.mk
+dnl   rm -f nsprpub/config/my_config.mk
+dnl   rm -f nsprpub/config/my_overrides.mk
+dnl   cp build/unix/nspr_my_config.mk nsprpub/config/my_config.mk
+dnl   cp build/unix/nspr_my_overrides.mk nsprpub/config/my_overrides.mk
 dnl fi