* aclocal.m4: Regenerate.

* stepmake/aclocal.m4: Also set GUILE_PATCH_LEVEL.

* config.hh.in: Only set GUILE_MAJOR_VERSION if necessary.
* lily/include/lily-guile.hh: Only include config.h if necessary.

diff --git a/ChangeLog b/ChangeLog
index d4a6d75251c716e2ef2744aa329121f8622b31f5..1a26461b27c33a6f0135f0a906734e522aa6809e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2002-06-20  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * aclocal.m4: Regenerate.
+
+       * stepmake/aclocal.m4: Also set GUILE_PATCH_LEVEL.
+
+       * config.hh.in: Only set GUILE_MAJOR_VERSION if necessary.
+       * lily/include/lily-guile.hh: Only include config.h if necessary.
+
        * Changlog: cvs changes ml archive test #8.
        
        * lily/slur-engraver.cc: Layout fix.

diff --git a/aclocal.m4 b/aclocal.m4
index 13de08358ced5b3880b6438a19a0feb7606ef6b7..4a7e7f092584dc9b02f9bf3c9d625660a210c5d9 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -405,10 +405,12 @@ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [
     changequote(<<, >>)dnl
     GUILE_MAJOR_VERSION=`expr $guile_version : '\([0-9]*\)'`
     GUILE_MINOR_VERSION=`expr $guile_version : '[0-9]*\.\([0-9]*\)'`
+    GUILE_PATCH_LEVEL=`expr $guile_version : '[0-9]*\.[0-9]*\.\([0-9]*\)'`
     changequote([, ])dnl
     STEPMAKE_GUILE_FLAGS
     AC_DEFINE_UNQUOTED(GUILE_MAJOR_VERSION, $GUILE_MAJOR_VERSION)
     AC_DEFINE_UNQUOTED(GUILE_MINOR_VERSION, $GUILE_MINOR_VERSION)
+    AC_DEFINE_UNQUOTED(GUILE_PATCH_LEVEL, $GUILE_PATCH_LEVEL)
 ])
 
 

diff --git a/config.hh.in b/config.hh.in
index b5e4575dc4d4a0cfc7c54c95e3b41894fd7c3148..6c58034b22d7ed3c5c5cb0d1d3badbd5abd7ea0c 100644 (file)
--- a/config.hh.in
+++ b/config.hh.in
@@ -73,8 +73,22 @@
 /* define if you have sys/stat.h */
 #define STAT_MACROS_BROKEN 0
 
+
+/* GUILE only includes version in headers (libguile/version.h) as of
+   1.5.x.  For some strange reason, they call it SCM.*VERSION. */
+#include <libguile.h>
+
+#ifndef GUILE_MAJOR_VERSION
+#ifdef SCM_MAJOR_VERSION
+#define GUILE_MAJOR_VERSION SCM_MAJOR_VERSION
+#define GUILE_MINOR_VERSION SCM_MINOR_VERSION
+#define GUILE_PATCH_LEVEL SCM_MICRO_VERSION
+#else
 /* define GUILE major version */
 #define GUILE_MAJOR_VERSION 0
-
 /* define GUILE minor version */
 #define GUILE_MINOR_VERSION 0
+/* define GUILE patch level */
+#define GUILE_PATCH_LEVEL 0
+#endif
+#endif

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index deda57935f9e17a46981a3b7a1c9a0aafe9ffaee..c9b0ee0e6220a03e669b951c04fef7325dac97e3 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -11,7 +11,6 @@
 
 #define SCM_VOIDP_TEST
 
-#include <libguile.h>
 
 /*
   TODO: the  GH interface is deprecated as of GUILE 1.6
@@ -20,7 +19,24 @@
  */
 #include <guile/gh.h>
 
+
+/* GUILE only includes version in headers (libguile/version.h) as of
+   1.5.x.  For some strange reason, they call it SCM.*VERSION.
+
+   Not including config.h here, saves a lot of unnecessary
+   recompiles. */
+#include <libguile.h>
+
+#ifndef GUILE_MAJOR_VERSION
+#ifdef SCM_MAJOR_VERSION
+#define GUILE_MAJOR_VERSION SCM_MAJOR_VERSION
+#define GUILE_MINOR_VERSION SCM_MINOR_VERSION
+#define GUILE_PATCH_LEVEL SCM_MICRO_VERSION
+#else
 #include "config.h"
+#endif
+#endif
+
 #include "drul-array.hh"
 
 

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index b63198794a9abc035b6b9fb951ade8e0056e43a7..d076ebc03aaa76f469c498007e73919d3e5616db 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -402,10 +402,12 @@ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [
     changequote(<<, >>)dnl
     GUILE_MAJOR_VERSION=`expr $guile_version : '\([0-9]*\)'`
     GUILE_MINOR_VERSION=`expr $guile_version : '[0-9]*\.\([0-9]*\)'`
+    GUILE_PATCH_LEVEL=`expr $guile_version : '[0-9]*\.[0-9]*\.\([0-9]*\)'`
     changequote([, ])dnl
     STEPMAKE_GUILE_FLAGS
     AC_DEFINE_UNQUOTED(GUILE_MAJOR_VERSION, $GUILE_MAJOR_VERSION)
     AC_DEFINE_UNQUOTED(GUILE_MINOR_VERSION, $GUILE_MINOR_VERSION)
+    AC_DEFINE_UNQUOTED(GUILE_PATCH_LEVEL, $GUILE_PATCH_LEVEL)
 ])