CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/31 14:09:00
Modified files:
. : ChangeLog
stepmake : aclocal.m4
Log message:
put FlexLexer.h test in conftest.cc. Fixes
spurious warning.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3691&tr2=1.3692&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/stepmake/aclocal.m4.diff?tr1=1.145&tr2=1.146&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3691 lilypond/ChangeLog:1.3692
--- lilypond/ChangeLog:1.3691 Tue May 31 13:55:27 2005
+++ lilypond/ChangeLog Tue May 31 14:09:00 2005
@@ -1,12 +1,17 @@
+2005-05-31 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* configure.in (reloc_b): Add --enable-argv0-relocation.
2005-05-31 Han-Wen Nienhuys <[EMAIL PROTECTED]>
- * 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.
Index: lilypond/stepmake/aclocal.m4
diff -u lilypond/stepmake/aclocal.m4:1.145 lilypond/stepmake/aclocal.m4:1.146
--- lilypond/stepmake/aclocal.m4:1.145 Wed May 18 14:22:25 2005
+++ lilypond/stepmake/aclocal.m4 Tue May 31 14:09:00 2005
@@ -414,10 +414,15 @@
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"[EMAIL PROTECTED]@\1@@!g' | grep '@@' |
\
sed '[EMAIL PROTECTED]@\(.*\)@@.*$!\1!g' ` >& /dev/null
+ rm conftest.cc
AC_SUBST(FLEXLEXER_PATH)
AC_MSG_RESULT($FLEXLEXER_PATH)
])
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
