(note-name->markup): don't superscript root

[lilypond.git] / config.hh.in

diff --git a/config.hh.in b/config.hh.in
index 98dbd72ffb288977ff5389c02a84c1a57ba1a6a4..71848269c4aa1313f46065b0a58ea6b76c99abf2 100644 (file)
--- a/config.hh.in
+++ b/config.hh.in
@@ -1,16 +1,22 @@
 /* @AUTOGENERATE@ */
 
-/* Hmm */
 #define PACKAGE "@package@"
 
-/* we don't set DIR_SHAREDSTATEDIR anymore */
-#define DIR_SHAREDSTATEDIR "@DIR_SHAREDSTATEDIR@"
+#define TOPLEVEL_VERSION "@TOPLEVEL_VERSION@"
 
-/* default lilypond init and input dir */
-#define  DIR_DATADIR "@DIR_DATADIR@"
+/* datadir */
+#define DATADIR "@DATADIR@"
+
+/* LilyPond init and input base directory */
+#define PACKAGE_DATADIR DATADIR "/" PACKAGE
+#define LILYPOND_DATADIR PACKAGE_DATADIR
+
+/* LilyPond specific init and input directory */
+#define LOCAL_PACKAGE_DATADIR PACKAGE_DATADIR "/" TOPLEVEL_VERSION
+#define LOCAL_LILYPOND_DATADIR LOCAL_PACKAGE_DATADIR
 
 /* default lilypond locale dir */
-#define  DIR_LOCALEDIR "@DIR_LOCALEDIR@"
+#define LOCALEDIR "@LOCALEDIR@"
 
 /* define if you have memmem */
 #define HAVE_MEMMEM 0
@@ -21,6 +27,9 @@
 /* define if you have vsnprintf */
 #define HAVE_VSNPRINTF 0
 
+/* define if you have yyFlexLexer.yy_current_buffer */
+#undef HAVE_FLEXLEXER_YY_CURRENT_BUFFER
+
 /* define if you have gettext */
 #define HAVE_GETTEXT 0
 
@@ -76,8 +85,24 @@
 /* define if you have sys/stat.h */
 #define STAT_MACROS_BROKEN 0
 
+/* define if you have sstream */
+#define HAVE_SSTREAM 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