Actually use CPPFLAGS when passed to configure.

nsprpub/config/autoconf.mk.in

@@ -48,8 +48,9 @@ NSINSTALL	= @NSINSTALL@
 FILTER		= @FILTER@
 IMPLIB		= @IMPLIB@
 
-OS_CFLAGS	= @CFLAGS@ $(DSO_CFLAGS)
-OS_CXXFLAGS	= @CXXFLAGS@ $(DSO_CFLAGS)
+OS_CPPFLAGS	= @CPPFLAGS@
+OS_CFLAGS	= $(OS_CPPFLAGS) @CFLAGS@ $(DSO_CFLAGS)
+OS_CXXFLAGS	= $(OS_CPPFLAGS) @CXXFLAGS@ $(DSO_CFLAGS)
 OS_LIBS         = @OS_LIBS@
 OS_LDFLAGS	= @LDFLAGS@
 OS_DLLFLAGS	= @OS_DLLFLAGS@

nsprpub/configure

@@ -4916,6 +4916,7 @@ fi
 
 
 
+
 
 
 MAKEFILES="

nsprpub/configure.in

@@ -1847,6 +1847,7 @@ AC_SUBST(CC)
 AC_SUBST(CXX)
 AC_SUBST(CFLAGS)
 AC_SUBST(CXXFLAGS)
+AC_SUBST(CPPFLAGS)
 AC_SUBST(HOST_CC)
 AC_SUBST(HOST_CFLAGS)
 AC_SUBST(LDFLAGS)