* configure.in (LINK_GXX_STATICALLY): use "" to allow $

expansion.

* lily/stencil-expression.cc (register_stencil_head): opps, append
to cdr of static SCM object. Backport.

diff --git a/ChangeLog b/ChangeLog
index 1d1c4debe593e94a24d6c562d40b92cff34998f0..d05689f3d54f5ca8009cef05a9a4ec4fc4f3115d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-24  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * configure.in (LINK_GXX_STATICALLY): use "" to allow $
+       expansion. 
+
+       * lily/stencil-expression.cc (register_stencil_head): opps, append
+       to cdr of static SCM object. Backport.
+
 2006-05-22  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * configure.in (LINK_GXX_STATICALLY): readlink for ncsb detect. 

diff --git a/configure.in b/configure.in
index df4c940e81e3237e601ee124dca014b981937224..b337b4f1300959a1ed7327f3e2dad08dcbf3e891 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -72,7 +72,7 @@ if test "$NCSB_DIR" != "" ;  then
 else
   if test "$FCMATCH" != ""; then
     for style in Roman Italic "Bold Italic" Bold; do
-      NCSB_FILE=`$FCMATCH --verbose 'Century Schoolbook L:style=$style' | grep 'file:'`
+      NCSB_FILE=`$FCMATCH --verbose "Century Schoolbook L:style=$style" | grep 'file:'`
 
       NCSB_FILE=`echo $NCSB_FILE | sed 's/^.*"\(.*\)".*$/\1/g'`
       NCSB_FILE=`readlink -f $NCSB_FILE`

diff --git a/lily/stencil-expression.cc b/lily/stencil-expression.cc
index ae9127cfbbc851f7563cfe880f7bed8b7083e091..6e51ec9b9d5ec334340c0617affdaf61b269698d 100644 (file)
--- a/lily/stencil-expression.cc
+++ b/lily/stencil-expression.cc
@@ -17,7 +17,7 @@ void register_stencil_head (SCM symbol)
     heads = scm_permanent_object (scm_cons (SCM_EOL, SCM_EOL));
   
   scm_set_object_property_x (symbol, ly_symbol2scm ("stencil-head?"), SCM_BOOL_T);
-  scm_set_cdr_x (heads,  scm_cons (symbol, heads));
+  scm_set_cdr_x (heads,  scm_cons (symbol, scm_cdr (heads)));
 }
 
 bool