X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=759091ee11f4adc11b72bde8aeaa26d6d2c94365;hb=e00af3ee09ebea4592c5eab0596314994c241ee0;hp=6cb7f5e253f4fb26483f89b7492bb1bf3a714aa4;hpb=2a5bf602e34fadfeb14b0d7be3b83fa587be3fbb;p=lilypond.git

diff --git a/lily/main.cc b/lily/main.cc
index 6cb7f5e253..759091ee11 100644
--- 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() {
@@ -239,9 +240,10 @@ static void
 notice ()
 {
   identify (stdout);
-  puts (_f (NOTICE, PROGRAM_NAME).c_str ());
   printf ("\n");
   copyright ();
+  printf ("\n");
+  puts (_f (NOTICE, PROGRAM_NAME).c_str ());
 }
 
 LY_DEFINE (ly_usage, "ly:usage",
@@ -556,7 +558,6 @@ parse_argv (int argc, char **argv)
 
   if (show_help)
     {
-      identify (stdout);
       ly_usage ();
       if (be_verbose_global)
 	dir_info (stdout);