X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config.hh.in;h=5e276610b977510860771d606364dc6ca1f553d4;hb=2d6904e4ff2dc96cc38406646d74c294dc528454;hp=04d22f741f250f8c4770d6e877b429633d6c7edb;hpb=a78c70be8951804126d19eb74b344ae1858023e5;p=lilypond.git

diff --git a/config.hh.in b/config.hh.in
index 04d22f741f..5e276610b9 100644
--- a/config.hh.in
+++ b/config.hh.in
@@ -1,18 +1,22 @@
 /* @AUTOGENERATE@ */
 
-/* Hmm */
 #define PACKAGE "@package@"
 
-/* define if bla bla /var and the like. */
-#define DIR_SHAREDSTATEDIR "@DIR_SHAREDSTATEDIR@"
+#define TOPLEVEL_VERSION "@TOPLEVEL_VERSION@"
 
-#define DIR_DATADIR "@DIR_DATADIR@"
+/* datadir */
+#define DATADIR "@DATADIR@"
 
-/* default lilypond init and input dir */
-#define  DIR_DATADIR "@DIR_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
@@ -41,6 +45,27 @@
 /* define if you have kpse_find_tfm */
 #define HAVE_KPSE_FIND_TFM 0
 
+/* define if you have python2.2/Python.h header */
+#define HAVE_PYTHON2_2_PYTHON_H 0
+
+/* define if you have python2.1/Python.h header */
+#define HAVE_PYTHON2_1_PYTHON_H 0
+
+/* define if you have python2.0/Python.h header */
+#define HAVE_PYTHON2_0_PYTHON_H 0
+
+/* define if you have python2/Python.h header */
+#define HAVE_PYTHON2_PYTHON_H 0
+
+/* define if you have python1.5/Python.h */
+#define HAVE_PYTHON1_5_PYTHON_H 0
+
+/* define if you have python/Python.h header */
+#define HAVE_PYTHON_PYTHON_H 0
+
+/* define if you have Python.h header */
+#define HAVE_PYTHON_H 0
+
 /* define if explicit instantiation is needed */
 #undef NEED_EXPLICIT_INSTANTIATION
 
@@ -57,8 +82,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