[PATCH] Assorted fixes for macosx 10.2.8

[Johannes Schindelin]

These fixes are in my private tree to fix several issues with the
compilation:

- fix in-tree compilation of user documentation
- fix dependency on FlexLexer.h
- lexer-gcc-3.1.sh does not work for me, so I have my own
- to compile the midi extension for python, special flags are needed

One very ugly fix is to comment out the display-music things in
music-functions-init.ly. Even if a comment in that file says that
upgrading to a new guile version should help, it didn't. (Strange
enough, on Linux it helped).

A big bug which haunted me for a long time is gone with Python 2.3:
when compiling examples.itely, the regexp handling would choke on
a string which was longer than a certain fixed size (IIRC 32kB).

So, maybe configure should fail when Python is older than 2.3?

Signed-off-by: Johannes Schindelin <address@hidden>

---

 Documentation/user/GNUmakefile      |    1 +
 lily/GNUmakefile                    |    3 ++-
 ly/music-functions-init.ly          |   12 ++++++------
 my-lexer-gcc-3.1.sh                 |   10 ++++++++++
 stepmake/stepmake/compile-vars.make |   10 +++++++---
 stepmake/stepmake/generic-vars.make |    5 +++++
 6 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 6ab1df3..9b9821a 100644
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -43,6 +43,7 @@ info: $(INFO_FILES)
 
 pathsettings:
        @echo export PATH=$(PATH)
+       @echo export LILYPOND_DATADIR=$(LILYPONDPREFIX)
        @echo export LILYPONDPREFIX=$(LILYPONDPREFIX)
        @echo export PYTHONPATH=$(PYTHONPATH)
 
diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 8d2e91a..fb9192e 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -67,10 +67,11 @@ endif
 
 # force these: Make can't know these have to be generated in advance
 $(outdir)/lily-parser.o: $(outdir)/parser.hh
-$(outdir)/lily-lexer.o: $(outdir)/parser.hh $(outdir)/FlexLexer.h
+$(outdir)/lily-lexer.o: $(outdir)/parser.hh
 $(outdir)/lexer.o: $(outdir)/parser.hh $(outdir)/version.hh
 
 ifneq ($(FLEXLEXER_FILE),)
+$(outdir)/lily-lexer.o: $(outdir)/FlexLexer.h
 $(outdir)/FlexLexer.h: $(FLEXLEXER_FILE) $(config_h)
        cp $< $@
 endif
diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index 798f466..50f5b07 100644
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -51,12 +51,12 @@ displayMusic =
 %% FIXME: guile-1.7 required?
 %#(use-modules (scm display-lily))invalid module name for use-syntax ((srfi 
srfi-39))
 
-#(use-modules (scm display-lily))
-#(display-lily-init parser)
-displayLilyMusic =
-#(def-music-function (parser location music) (ly:music?)
-   (display-lily-music music)
-   music)
+%#(use-modules (scm display-lily))
+%#(display-lily-init parser)
+%displayLilyMusic =
+%#(def-music-function (parser location music) (ly:music?)
+%   (display-lily-music music)
+%   music)
 
 applyOutput =
 #(def-music-function (parser location proc) (procedure?)
diff --git a/my-lexer-gcc-3.1.sh b/my-lexer-gcc-3.1.sh
new file mode 100644
index 0000000..c781409
--- /dev/null
+++ b/my-lexer-gcc-3.1.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+cd "$(dirname "$0")/lily"
+
+rm out/lexer.cc 2>/dev/null
+make out/lexer.cc
+mv out/lexer.cc out/lexer.cc.orig
+cat out/lexer.cc.orig | sed 's/^class istream;$/#include <iostream>\
+using namespace std;/' > out/lexer.cc
+
diff --git a/stepmake/stepmake/compile-vars.make 
b/stepmake/stepmake/compile-vars.make
index b39499b..9af6eb5 100644
--- a/stepmake/stepmake/compile-vars.make
+++ b/stepmake/stepmake/compile-vars.make
@@ -3,10 +3,14 @@ ARFLAGS = ru
 ALL_LDFLAGS = $(LDFLAGS) $(CONFIG_LDFLAGS) $($(PACKAGE)_LDFLAGS) 
$(MODULE_LDFLAGS) $(CONFIG_LDFLAGS)
 
 PIC_FLAGS = -fpic -fPIC
-ifeq ($(MINGW_BUILD),)
-SHARED_FLAGS = -shared
-else
+ifneq ($(MINGW_BUILD),)
 SHARED_FLAGS = -mdll
+else
+ifneq ($(DARWIN_BUILD),)
+SHARED_FLAGS = -bundle -flat_namespace -framework Python
+else
+SHARED_FLAGS = -shared
+endif
 endif
 
 o-dep-out = $(outdir)/$(subst .o,.dep,$(notdir $@))#
diff --git a/stepmake/stepmake/generic-vars.make 
b/stepmake/stepmake/generic-vars.make
index fc7e89e..0de08f8 100644
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -111,3 +111,8 @@ endif
 ifeq ($(HOST_ARCH),i386-mingw32)
 MINGW_BUILD = yes
 endif
+
+ifeq ($(HOST_ARCH),ppc-darwin)
+DARWIN_BUILD = yes
+endif
+