From c38aecdef09258eea51e827ff716f113c4d34125 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Sat, 11 Feb 2006 15:34:25 +0000
Subject: [PATCH] * 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.
---
 ChangeLog        |  7 +++++++
 configure.in     |  5 -----
 lily/relocate.cc | 18 ++++++++++++++----
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c4a39c8147..b3cbb38517 100644
--- 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 94d02af55d..fbc4c47ee1 100644
--- 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 ffb32d5415..8a2d724387 100644
--- 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");
-- 
2.39.5