X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config.hh.in;h=cb6a64eafe331344ba8e4d6e1aa15315179c6458;hb=f17281ba19ee591b2199cf8edb15f69d72bb772a;hp=d1eea7facd1eee3cbcae1940556392c4861bd27a;hpb=3189be8f879384108e2d99fe83c972d68c5215dd;p=lilypond.git

diff --git a/config.hh.in b/config.hh.in
index d1eea7facd..cb6a64eafe 100644
--- a/config.hh.in
+++ b/config.hh.in
@@ -2,15 +2,17 @@
 
 #define PACKAGE "@package@"
 
+#define TOPLEVEL_VERSION "@TOPLEVEL_VERSION@"
+
 /* datadir */
 #define DATADIR "@DATADIR@"
 
 /* LilyPond init and input base directory */
-#define PACKAGE_DATADIR "@PACKAGE_DATADIR@"
+#define PACKAGE_DATADIR DATADIR "/" PACKAGE
 #define LILYPOND_DATADIR PACKAGE_DATADIR
 
 /* LilyPond specific init and input directory */
-#define LOCAL_PACKAGE_DATADIR "@local_package_datadir@"
+#define LOCAL_PACKAGE_DATADIR PACKAGE_DATADIR "/" TOPLEVEL_VERSION
 #define LOCAL_LILYPOND_DATADIR LOCAL_PACKAGE_DATADIR
 
 /* default lilypond locale dir */
@@ -25,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@
 
@@ -43,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
 
@@ -83,21 +73,11 @@
 /* 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
+/* define if you have pango 1.6 */
+#define HAVE_PANGO16 0
+
+/* define if you have pango FT2 binding */
+#define HAVE_PANGO_FT2 0
+
+/* define if you have pango_fc_font_map_add_decoder_find_func */
+#define HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC 0