X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config.hh.in;h=cb6a64eafe331344ba8e4d6e1aa15315179c6458;hb=04a9f6c6981c78a3640bfe62606d2cc13f323d25;hp=98dbd72ffb288977ff5389c02a84c1a57ba1a6a4;hpb=fed60bcf7c72379696ab8d478b4e5b91566d3f30;p=lilypond.git

diff --git a/config.hh.in b/config.hh.in
index 98dbd72ffb..cb6a64eafe 100644
--- 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,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@
 
@@ -39,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
 
@@ -76,8 +70,14 @@
 /* define if you have sys/stat.h */
 #define STAT_MACROS_BROKEN 0
 
-/* define GUILE major version */
-#define GUILE_MAJOR_VERSION 0
+/* define if you have sstream */
+#define HAVE_SSTREAM 0
+
+/* define if you have pango 1.6 */
+#define HAVE_PANGO16 0
+
+/* define if you have pango FT2 binding */
+#define HAVE_PANGO_FT2 0
 
-/* define GUILE minor version */
-#define GUILE_MINOR_VERSION 0
+/* define if you have pango_fc_font_map_add_decoder_find_func */
+#define HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC 0