From a8af466fcf753135517e7610b3d26d1457efe090 Mon Sep 17 00:00:00 2001 From: "Roy T. Fielding" Date: Fri, 18 May 2001 02:36:35 +0000 Subject: [PATCH] Get the compile flag types right and in order. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89142 13f79535-47bb-0310-9956-ffa450edef68 --- build/rules.mk | 6 +++--- configure.in | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/rules.mk b/build/rules.mk index c7ef27312c..383abacbff 100644 --- a/build/rules.mk +++ b/build/rules.mk @@ -61,8 +61,8 @@ include $(top_builddir)/config_vars.mk # Note that includes are listed after the flags because -I options have # left-to-right precedence and CPPFLAGS may include user-defined overrides. # -ALL_CPPFLAGS = $(DEFS) $(EXTRA_CPPFLAGS) $(NOTEST_CPPFLAGS) $(CPPFLAGS) ALL_CFLAGS = $(EXTRA_CFLAGS) $(NOTEST_CFLAGS) $(CFLAGS) +ALL_CPPFLAGS = $(DEFS) $(EXTRA_CPPFLAGS) $(NOTEST_CPPFLAGS) $(CPPFLAGS) ALL_CXXFLAGS = $(EXTRA_CXXFLAGS) $(NOTEST_CXXFLAGS) $(CXXFLAGS) ALL_LDFLAGS = $(EXTRA_LDFLAGS) $(NOTEST_LDFLAGS) $(LDFLAGS) ALL_LIBS = $(EXTRA_LIBS) $(NOTEST_LIBS) $(LIBS) @@ -70,8 +70,8 @@ ALL_INCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) # Compile commands -COMPILE = $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(ALL_INCLUDES) -CXX_COMPILE = $(CXX) $(ALL_CPPFLAGS) $(ALL_CXXFLAGS) $(ALL_INCLUDES) +COMPILE = $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(ALL_INCLUDES) +CXX_COMPILE = $(CXX) $(ALL_CXXFLAGS) $(ALL_CPPFLAGS) $(ALL_INCLUDES) SH_COMPILE = $(SH_LIBTOOL) --mode=compile $(COMPILE) -c $< && touch $@ SH_CXX_COMPILE = $(SH_LIBTOOL) --mode=compile $(CXX_COMPILE) -c $< && touch $@ diff --git a/configure.in b/configure.in index 3f158b9af4..23cfb9fd1a 100644 --- a/configure.in +++ b/configure.in @@ -191,7 +191,7 @@ dnl ## Check for typedefs, structures, and compiler characteristics. AC_C_CONST if test "$ac_cv_prog_gcc" = "yes"; then - APR_ADDTO(CPPFLAGS,-DAP_HAVE_DESIGNATED_INITIALIZER) + APR_ADDTO(NOTEST_CPPFLAGS,-DAP_HAVE_DESIGNATED_INITIALIZER) fi dnl ## Check for library functions -- 2.50.1