From e0019eac944474d46ac1b12cf2cd7ed1aac739d4 Mon Sep 17 00:00:00 2001 From: hanwen Date: Wed, 3 May 2006 20:30:59 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 2 ++ input/tutorial/lbook-html-test.html | 24 ++++++++++++++++++++++-- stepmake/aclocal.m4 | 7 +++++++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b915dd46ae..a723aaf3b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ 2006-05-03 Han-Wen Nienhuys + * stepmake/aclocal.m4: run python-config for crosscompiling flags. + * scripts/lilypond-book.py (Lilypond_file_snippet.my_system): add -f png for HTML, TEXINFO formats. diff --git a/input/tutorial/lbook-html-test.html b/input/tutorial/lbook-html-test.html index a55d74d8f9..0a64062447 100644 --- a/input/tutorial/lbook-html-test.html +++ b/input/tutorial/lbook-html-test.html @@ -1,4 +1,7 @@ - + + + +

Documents for lilypond-book may freely mix music and text. For example, @@ -11,4 +14,21 @@ example, c'4 f16 - + +

+ +

+ +This page is for LilyPond-2.9.3 (development-branch).
+ +

+Report errors to http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs.
+

+
+ +

+ Other languages: English. +
+ Using automatic language selection. +

+ diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 3718904ceb..3ae4f92df6 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -1027,6 +1027,11 @@ AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [ changequote([, ])#dnl fi + if test "$cross_compiling" = "yes" -a -z "$PYTHON_CFLAGS"; then + PYTHON_CFLAGS=`python-config --cflags` + PYTHON_LDFLAGS=`python-config --ldflags` + fi + if test -z "$PYTHON_HEADER"; then CPPFLAGS="$PYTHON_CFLAGS $CPPFLAGS" AC_CHECK_HEADERS([Python.h],[PYTHON_HEADER=yes]) @@ -1038,6 +1043,8 @@ AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [ fi ]) + + AC_DEFUN(STEPMAKE_STL_DATA_METHOD, [ AC_LANG_PUSH(C++) AC_CACHE_CHECK([for stl.data () method], -- 2.39.5