* configure.in (LINK_GXX_STATICALLY): strip -DSTRING_UTILS_INLINED options.

* lily/relocate.cc (framework_relocation): use getenv
LILYPOND_GS_VERSION or -DGHOSTSCRIPT_VERSION to set GS version.

diff --git a/ChangeLog b/ChangeLog
index c4a39c8147ec45a8cce9983f434dd80bd8001c6e..b3cbb385177125877d56da166f30d24ae03a3958 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-11  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * configure.in (LINK_GXX_STATICALLY): strip -DSTRING_UTILS_INLINED options.
+
+       * lily/relocate.cc (framework_relocation): use getenv
+       LILYPOND_GS_VERSION or -DGHOSTSCRIPT_VERSION to set GS version.
+
 2006-02-11  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * flower/include/std-string.hh: 

diff --git a/configure.in b/configure.in
index 94d02af55d94c09bd25ce6030f47478d61e29347..fbc4c47ee133c47ebd13ec2af2c03f365712c31c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -163,11 +163,6 @@ STEPMAKE_PERL(OPTIONAL)
 # makeinfo--but hopefully won't report makeinfo problems.
 STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.7)
 
-if test "$optimise_b" = yes; then
-    DEFINES="$DEFINES -DSTRING_UTILS_INLINED"
-    AC_DEFINE(STRINGS_UTILS_INLINED)
-fi
-
 AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
 
 # Gather requirements and generate output.

diff --git a/lily/relocate.cc b/lily/relocate.cc
index ffb32d54153edafa42b69ece4c3708e92b0ecafc..8a2d72438714d951d99562c23c90bb4943c0dabe 100644 (file)
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -144,10 +144,20 @@ framework_relocation (string prefix)
   prepend_env_path ("GS_FONTPATH", font_dir);
 #endif
 
-  /* FIXME: *cough* 8.15 *cough* */
-  prepend_env_path ("GS_FONTPATH", datadir + "/ghostscript/8.15/fonts");
-  prepend_env_path ("GS_LIB", datadir + "/ghostscript/8.15/Resource");
-  prepend_env_path ("GS_LIB", datadir + "/ghostscript/8.15/lib");
+  string gs_version =
+#ifdef GHOSTSCRIPT_VERSION
+    GHOSTSCRIPT_VERSION
+#else
+    "8.15"
+#endif
+    ;
+  
+  if (char const *cur = getenv ("LILYPOND_GS_VERSION"))
+    gs_version = cur;
+  
+  prepend_env_path ("GS_FONTPATH", datadir + "/ghostscript/" + gs_version + "/fonts");
+  prepend_env_path ("GS_LIB", datadir + "/ghostscript/" + gs_version + "/Resource");
+  prepend_env_path ("GS_LIB", datadir + "/ghostscript/" + gs_version + "/lib");
 
   prepend_env_path ("GS_FONTPATH", datadir + "/gs/fonts");
   prepend_env_path ("GS_LIB", datadir + "/gs/Resource");