From: Paul Jarc <prj@po.cwru.edu>
Date: Sat, 23 Aug 2008 13:58:40 +0000 (+0200)
Subject: Fix configure and compilation issues with CPPFLAGS
X-Git-Tag: release/2.11.57-1~24^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e32b9a4ece3230cad24dd74703f56abdc5643910;p=lilypond.git

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 b69dc9c23b..d692776da2 100644
--- 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 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)