Fix configure and compilation issues with CPPFLAGS

Use CPPFLAGS when finding FlexLexer.h, and for C++ compilation commands.

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index b69dc9c23b4c78dd1f77f8bbab56230ed66826f0..d692776da28d48142465fd54eb13fc0d13fb7af9 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -452,7 +452,7 @@ AC_DEFUN(STEPMAKE_FLEXLEXER_LOCATION, [
 using namespace std;
 #include <FlexLexer.h>
 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 fdc8b57af4d9c00dba5460dd83c0e821bf13413f..923377ddc4ef55a757c2c92e6455e77b9c39c487 100644 (file)
--- 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)