X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config.hh.in;h=96ede6ebae7c71b378f322af4602b17a3f7db688;hb=d766d2b4b3881f9b067173f44b25b758431e1517;hp=1c16bed76b6f7c10c7b162884a1fe66dbf93def6;hpb=37c76c23cb05889583259f0228daae38d602c666;p=lilypond.git

diff --git a/config.hh.in b/config.hh.in
index 1c16bed76b..96ede6ebae 100644
--- a/config.hh.in
+++ b/config.hh.in
@@ -1,13 +1,22 @@
 /* @AUTOGENERATE@ */
 
-/* Hmm */
 #define PACKAGE "@package@"
 
-/* default lilypond init and input dir */
-#define  DIR_DATADIR "@DIR_DATADIR@"
+#define TOPLEVEL_VERSION "@TOPLEVEL_VERSION@"
+
+/* 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
@@ -18,12 +27,18 @@
 /* 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
 
 /* define if you have isinf */
 #define HAVE_ISINF 0
 
+/* define if you have lrint */
+#define HAVE_LRINT 0
+
 /* define if you want KPATHSEA */
 #define KPATHSEA @KPATHSEA@
 
@@ -36,24 +51,6 @@
 /* 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