Actually use CPPFLAGS when passed to configure.
authorcls%seawood.org
Fri, 09 Mar 2001 04:51:09 +0000
changeset 1770 9dc0fbc1c989264e945628e4b6a9c608afc5e218
parent 1768 57dcee5d16aa71b08367b61275a19155266d75fd
child 1773 2f3190f67ef16b65acc88dee2d8fc51e4d141d77
push idunknown
push userunknown
push dateunknown
Actually use CPPFLAGS when passed to configure.
config/autoconf.mk.in
configure
configure.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -43,18 +43,19 @@ PERL		= @PERL@
 DLLTOOL		= @DLLTOOL@
 WINDRES		= @WINDRES@
 RC		= @RC@
 STRIP		= @STRIP@
 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@
 DLLFLAGS	= @DLLFLAGS@
 EXEFLAGS  = @EXEFLAGS@
 OPTIMIZER	= @OPTIMIZER@
 
 MKSHLIB		= @MKSHLIB@
--- a/configure
+++ b/configure
@@ -4913,16 +4913,17 @@ fi
 
 
 
 
 
 
 
 
+
 MAKEFILES="
 Makefile 
 config/Makefile
 config/autoconf.mk
 config/nsprincl.mk
 config/nsprincl.sh
 lib/Makefile 
 lib/ds/Makefile 
--- a/configure.in
+++ b/configure.in
@@ -1842,16 +1842,17 @@ fi
 dnl ========================================================
 dnl Substitution of found variables.
 dnl ========================================================
 AC_SUBST(MOZILLA_CLIENT)
 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)
 AC_SUBST(GNU_CC)
 AC_SUBST(CROSS_COMPILE)
 
 AC_SUBST(MOZ_OPTIMIZE)