patch::: 1.2.11.jcn2

pl 11.jcn2
	- bf: LDFLAGS=foo CFLAGS=bar ./configure
	- bf: configure (--disable-printing = default) -DNPRINT
	- bf: mf-to-xpms / make -C mf xpms; feta-accordion is broken,
	  see mf/README

11 files changed, 74 insertions, 24 deletions

diff --git a/BUGS b/BUGS
index f9c6a51ea8..bae74b31f4 100644
--- a/BUGS
+++ b/BUGS
@@ -34,10 +34,12 @@ A binary RPM of Guile 1.3 has been distributed from the LilyPond ftp
 site.  This binary was made in RedHat 5.x, and it will fail if this
 RPM is used with RedHat 6.x.
 
+
 [GUILE 1.3.2]
 
 Guile 1.3.2 is buggy in several respects. Do not use it for LilyPond.
 
+
 [LinuxPPC, egcs-1.1b]
 
 Lilypond 1.1.35-1.1.51,...:  Wierd errors in guile scm_gc_mark ()
@@ -48,6 +50,33 @@ Lilypond 1.1.35-1.1.51,...:  Wierd errors in guile scm_gc_mark ()
 GNU make-3.77 is buggy on this platform, upgrade to 3.78.1 or newer.
 
 
+[Sparc64/Solaris 2.6, ld]
+
+Not yet resolved.
+
+
+[AIX 4.3 ld]
+
+The following is from the gcc install/SPECIFIC file.
+
+   Some versions of the AIX binder (linker) can fail with a relocation
+   overflow severe error when the -bbigtoc option is used to link
+   GCC-produced object files into an executable that overflows the TOC.
+A
+   fix for APAR IX75823 (OVERFLOW DURING LINK WHEN USING GCC AND  
+   -BBIGTOC) is available from IBM Customer Support and from its
+   [27]service.boulder.ibm.com website as PTF U455193.   
+
+   Binutils does not support AIX 4.3 (at least through release 2.9). GNU
+   as and GNU ld will not work properly and one should not configure GCC
+   to use those GNU utilities. Use the native AIX tools which do
+   interoperate with GCC.
+
+add -Wl,-bbigtoc to USER_LDFLAGS, ie:
+
+    LDFLAGS='-Wl,-bbigtoc' ./configure
+
+
 [All platforms] 
 
 Some bugs may be captured in input/bugs/*y
diff --git a/CHANGES b/CHANGES
index 319d800af1..be266bf96d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+pl 11.jcn2
+	- bf: LDFLAGS=foo CFLAGS=bar ./configure
+	- bf: configure (--disable-printing = default) -DNPRINT
+	- bf: mf-to-xpms / make -C mf xpms; feta-accordion is broken,
+	  see mf/README
+
 pl 11.jcn1
 	- gnossiene with new \autochange
 
diff --git a/TODO b/TODO
index 9d0fd5f962..35118d20bc 100644
--- a/TODO
+++ b/TODO
@@ -5,13 +5,18 @@
 Features you cannot find in the documentation as working, should be
 mentioned here.  This is an assorted collection of stuff that will be
 done, might be done, or is an idea that we want to think about.
-m
+
 Most of the items are marked in the code as well
 Grep -i for TODO, FIXME and ugh/ugr/urg.  
 
 .* TODO
 . * use Rhythmic_head::position_i () for all Staff_referenced 
 . * setting indent to 0 with \shape fails
+. * fix or replace feta-accordion.mf
+. * fix configure with CFLAGS or LDFLAGS, try:
+   CFLAGS=-g LDFLAGS='-Wl,--warn-common' ./configure
+configure will use them while testing the compiler, but they don't
+appear in config.make
 . * junk -M ?
 . * mudela-book doco
 . * Depracate Wordwrap
diff --git a/VERSION b/VERSION
index 437df27278..fdd02fd521 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=2
 PATCH_LEVEL=11
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/aclocal.m4 b/aclocal.m4
index c71271fe54..89e1a1018e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -8,8 +8,9 @@ dnl StepMake subroutines for configure.in
 AC_DEFUN(AC_STEPMAKE_COMPILE, [
     # -O is necessary to get inlining
     OPTIMIZE=""
-    CXXFLAGS=${CXXFLAGS:-""}
     CFLAGS=${CFLAGS:-""}
+    CXXFLAGS=${CXXFLAGS:-$CFLAGS}
+    LDFLAGS=${LDFLAGS:-""}
     checking_b=yes
     optimise_b=no
     profile_b=no
@@ -42,12 +43,6 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [
     [MINGWPREFIX=$enableval],
     [MINGWPREFIX=no])
 
-    if test "$printing_b" = no; then
-	# ugh
-	AC_DEFINE(NPRINT)
-	DEFINES="$DEFINES -DNPRINT"
-    fi
-	
     if test "$checking_b" = no; then
 	# ugh
 	AC_DEFINE(NDEBUG)
@@ -101,7 +96,7 @@ AC_DEFUN(AC_STEPMAKE_CXX, [
 
     CPPFLAGS="$CPPFLAGS $DEFINES"
     CXXFLAGS="$CXXFLAGS $OPTIMIZE"
-    LDFLAGS=$EXTRA_LIBES
+    LDFLAGS="$LDFLAGS $EXTRA_LIBES"
 
     AC_SUBST(CXXFLAGS)
     AC_SUBST(CXX)
diff --git a/buildscripts/mf-to-xpms.sh b/buildscripts/mf-to-xpms.sh
index 03729893d9..3e3d84dcd0 100755
--- a/buildscripts/mf-to-xpms.sh
+++ b/buildscripts/mf-to-xpms.sh
@@ -44,11 +44,11 @@ fi
 
 # numbered files
 if [ "x$named" = "x" ]; then
-	NUMS=`grep "^C *[0-9]*;" $afm | sed "s!^C *\([^;]*\).*!\\1!"`
-	PBMS=`grep "^C *[0-9]*;" $afm | sed "s!^C *\([^;]*\).*!out/$font-\\1.pbm!"`
+	NUMS=`grep "^C *[0-9]* *;" $afm | sed "s!^C *\([^ ;]*\).*!\\1!"`
+	PBMS=`grep "^C *[0-9]* *;" $afm | sed "s!^C *\([^ ;]*\).*!out/$font-\\1.pbm!"`
 else
-	NUMS=`grep "^C *[0-9]*;" $afm | sed "s!^C [^;]*; *N *\([^;]*\).*!\\1!"`
-	PBMS=`grep "^C *[0-9]*;" $afm | sed "s!^C [^;]*; *N *\([^;]*\).*!out/$font-\\1.pbm!"`
+	NUMS=`grep "^C *[0-9]* *;" $afm | sed "s!^C *.*; *N *\([^ ;]*\).*!\\1!"`
+	PBMS=`grep "^C *[0-9]* *;" $afm | sed "s!^C *.*; *N *\([^ ;]*\).*!out/$font-\\1.pbm!"`
 fi
 
 # $PKTOPBM out/$font.${RESOLUTION}pk -x 100 -y 100 $PBMS
diff --git a/config.make.in b/config.make.in
index 0c1b920b10..9d4523660e 100644
--- a/config.make.in
+++ b/config.make.in
@@ -6,7 +6,7 @@ package-depth = @package_depth@
 
 USER_CFLAGS = @CFLAGS@
 USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@
-USER_LDFLAGS = @GUILE_LDFLAGS@
+USER_LDFLAGS = @LDFLAGS@ @GUILE_LDFLAGS@
 
 CC = @CC@
 CXX = @CXX@
diff --git a/configure.in b/configure.in
index bb3fa611c1..d1fff38d70 100644
--- a/configure.in
+++ b/configure.in
@@ -19,12 +19,18 @@ printing_b=no
 AC_ARG_ENABLE(printing,
     [  enable-printing         turn on debug printing. Default: off],
     [printing_b=$enableval])
-    
+
 if test "$optimise_b" = yes; then
     DEFINES="$DEFINES -DSTRING_UTILS_INLINED"
     AC_DEFINE(STRINGS_UTILS_INLINED)
 fi
 
+if test "$printing_b" = no; then
+    # ugh
+    AC_DEFINE(NPRINT)
+    DEFINES="$DEFINES -DNPRINT"
+fi
+
 AC_STEPMAKE_CXX
 AC_STEPMAKE_GXX
 AC_STEPMAKE_CXXTEMPLATE
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 30b86751ed..bee2d0d6b9 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -8,6 +8,7 @@ EXTRA_DIST_FILES += README
 
 FET_FILES = $(wildcard feta[0-9]*.mf)
 FONT_FILES = $(wildcard feta*[0-9].mf)
+XPM_FONTS = feta20
 
 LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log))
 TEXTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tex))
diff --git a/mf/README b/mf/README
index 8f78c89183..7dad4c4a22 100644
--- a/mf/README
+++ b/mf/README
@@ -3,3 +3,16 @@ This is a font of music symbols.  All MF sources are original.  Most
 of the doco is in comments in the MF code, and in
 Documentation/tex/fonts.doc
 
+To make xpms of feta20 font:
+
+    make xpms
+
+
+Accordion symbols are broken: comment-out 
+
+    input feta-accordion;
+
+from feta-schrift, and remake mf dir:
+
+    make clean
+    make all xpms
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 1bbc0f1cc9..4a9c9fac2b 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -6,8 +6,9 @@ dnl StepMake subroutines for configure.in
 AC_DEFUN(AC_STEPMAKE_COMPILE, [
     # -O is necessary to get inlining
     OPTIMIZE=""
-    CXXFLAGS=${CXXFLAGS:-""}
     CFLAGS=${CFLAGS:-""}
+    CXXFLAGS=${CXXFLAGS:-$CFLAGS}
+    LDFLAGS=${LDFLAGS:-""}
     checking_b=yes
     optimise_b=no
     profile_b=no
@@ -40,12 +41,6 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [
     [MINGWPREFIX=$enableval],
     [MINGWPREFIX=no])
 
-    if test "$printing_b" = no; then
-	# ugh
-	AC_DEFINE(NPRINT)
-	DEFINES="$DEFINES -DNPRINT"
-    fi
-	
     if test "$checking_b" = no; then
 	# ugh
 	AC_DEFINE(NDEBUG)
@@ -99,7 +94,7 @@ AC_DEFUN(AC_STEPMAKE_CXX, [
 
     CPPFLAGS="$CPPFLAGS $DEFINES"
     CXXFLAGS="$CXXFLAGS $OPTIMIZE"
-    LDFLAGS=$EXTRA_LIBES
+    LDFLAGS="$LDFLAGS $EXTRA_LIBES"
 
     AC_SUBST(CXXFLAGS)
     AC_SUBST(CXX)