From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 31 May 2005 14:09:00 +0000 (+0000)
Subject: put FlexLexer.h test in conftest.cc. Fixes
X-Git-Tag: release/2.5.27~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=adc7c4f282bd67ef79502c1561444efacaa063d8;p=lilypond.git

put FlexLexer.h test in conftest.cc. Fixes
spurious warning.
---

diff --git a/ChangeLog b/ChangeLog
index 4edc613a95..26bfe8eb43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,17 @@
+2005-05-31  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* stepmake/aclocal.m4: put FlexLexer.h test in conftest.cc. Fixes
+	spurious warning.
+
+	* scm/font.scm (make-century-schoolbook-tree): use Sans for sans
+	serif.
+
 2005-05-31  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* configure.in (reloc_b): Add --enable-argv0-relocation.
 
 2005-05-31  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
-	* scm/font.scm (make-century-schoolbook-tree): use Sans for sans
-	serif.
-
 	* lily/pfb.cc (LY_DEFINE): show file name when loading PFB. 
 
 	* input/regression/alignment-order.ly: add Staff example.
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index d6cd6231f0..e249e98a67 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -414,10 +414,15 @@ class yy_flex_lexer: public yyFlexLexer
 AC_DEFUN(STEPMAKE_FLEXLEXER_LOCATION, [
 	AC_MSG_CHECKING([FlexLexer.h path])
 
-	# ugh. 
-	FLEXLEXER_PATH=`echo '#include <FlexLexer.h>' | $CXX -E - | \
+	# ugh.
+	cat <<EOF > conftest.cc
+using namespace std;
+#include <FlexLexer.h>
+EOF
+	FLEXLEXER_PATH=`$CXX -E conftest.cc | \
 	  sed 's!# 1 "\(.*\)FlexLexer.h"!@FLEXLEXER@\1@@!g' | grep '@@' | \
 	  sed 's!.*@FLEXLEXER@\(.*\)@@.*$!\1!g' ` >& /dev/null
+	rm conftest.cc
 	AC_SUBST(FLEXLEXER_PATH)
         AC_MSG_RESULT($FLEXLEXER_PATH)
 ])