Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

diff --git a/buildscripts/output-distance.py b/buildscripts/output-distance.py
index fed9aafcbe1b81a39e7f0f1b08e0f43eed4c8f7e..8586d2481ab9cb9beb45bcd06c4b64685eee63b7 100644 (file)
--- a/buildscripts/output-distance.py
+++ b/buildscripts/output-distance.py
@@ -611,8 +611,8 @@ class SignatureFileLink (FileLink):
                 outfile = (dest_dir + '/' + f).replace ('.eps', '.png')
                 data_option = ''
                 if options.local_data_dir:
-                    data_option = ('-slilypond-datadir=%s/share/lilypond/current '
-                                   % os.path.split(infile)[0])
+                    data_option = ('-slilypond-datadir=%s/../share/lilypond/current '
+                                   % os.path.dirname(infile))
                 
                 mkdir (os.path.split (outfile)[0])
                 cmd = ('gs -sDEVICE=png16m -dGraphicsAlphaBits=4 -dTextAlphaBits=4 '

diff --git a/config.hh.in b/config.hh.in
index d7aca8f1f2834d57fcd5ebea560156ad6284813d..034e123d7843c32a95721aa85d3f36a52393a02c 100644 (file)
--- a/config.hh.in
+++ b/config.hh.in
@@ -83,6 +83,9 @@
 /* define if you have sys/stat.h */
 #define HAVE_SYS_STAT_H 0
 
+/* define if you have fpu_control.h */
+#define HAVE_FPU_CONTROL_H 0
+
 /* define if you have sys/stat.h */
 #define STAT_MACROS_BROKEN 0
 

diff --git a/configure.in b/configure.in
index 38a7957081b7e1eb7e8e82dac502c9613cfc8340..8a193d0c6acd519224e459eb167abe840f1db303 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -133,7 +133,7 @@ STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.15)
 
 STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624)
 
-AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h])
+AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h fpu_control.h])
 AC_LANG_PUSH(C++)
 AC_CHECK_HEADERS([sstream boost/lambda/lambda.hpp])
 AC_LANG_POP(C++)

diff --git a/lily/main.cc b/lily/main.cc
index 6cb7f5e253f4fb26483f89b7492bb1bf3a714aa4..e0f5dda1a2d93a34a3a06b4834b60954a6fa4dbb 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -172,7 +172,8 @@ char const *LILYPOND_DATADIR = PACKAGE_DATADIR "/" TOPLEVEL_VERSION;
    unpredictable places. To get around this, we tell the x87 FPU to use only
    double precision. Note that this is not needed for x86_64 because that uses
    the SSE unit by default instead of the x87 FPU. */
-#if defined(__x86__) || defined(__i386__)
+#if ((defined(__x86__) || defined(__i386__)) \
+  && defined(HAVE_FPU_CONTROL_H) && (HAVE_FPU_CONTROL_H == 1))
 
 #include <fpu_control.h>
 static void configure_fpu() {