From e32b9a4ece3230cad24dd74703f56abdc5643910 Mon Sep 17 00:00:00 2001 From: Paul Jarc Date: Sat, 23 Aug 2008 15:58:40 +0200 Subject: [PATCH] Fix configure and compilation issues with CPPFLAGS Use CPPFLAGS when finding FlexLexer.h, and for C++ compilation commands. --- stepmake/aclocal.m4 | 2 +- stepmake/stepmake/c++-vars.make | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index b69dc9c23b..d692776da2 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -452,7 +452,7 @@ AC_DEFUN(STEPMAKE_FLEXLEXER_LOCATION, [ using namespace std; #include EOF - FLEXLEXER_FILE=`$CXX -E conftest.cc | \ + FLEXLEXER_FILE=`eval $ac_cpp conftest.cc | \ sed 's!# 1 "\(.*FlexLexer.h\)"!@FLEXLEXER@\1@@!g' | grep '@@' | \ sed 's!.*@FLEXLEXER@\(.*\)@@.*$!\1!g' ` 1> /dev/null 2> /dev/null rm conftest.cc diff --git a/stepmake/stepmake/c++-vars.make b/stepmake/stepmake/c++-vars.make index fdc8b57af4..923377ddc4 100644 --- a/stepmake/stepmake/c++-vars.make +++ b/stepmake/stepmake/c++-vars.make @@ -6,7 +6,7 @@ EXTRA_CXXFLAGS = -W -Wall -Wconversion #EXTRA_CXXFLAGS += -Werror #endif -ALL_CXXPPFLAGS = $(DEFINES) $(INCLUDES:%=-I%) +ALL_CXXPPFLAGS = $(CPPFLAGS) $(CONFIG_CPPFLAGS) $(DEFINES) $(INCLUDES:%=-I%) ALL_CXXFLAGS = $(CXXFLAGS) $(ALL_CXXPPFLAGS) $($(PACKAGE)_CXXFLAGS) $(CONFIG_CXXFLAGS) $(MODULE_CXXFLAGS) $(EXTRA_CXXFLAGS) TCC_FILES := $(call src-wildcard,*.tcc) -- 2.39.2