* lily/lily-guile.cc:

* lily/pangofc-afm-decoder.cc:
* lily/include/pangofc-afm-decoder.hh: Use #if HAVE_* iso #ifdef.
Fixes build without Pango CVS.  Use "pangofc-afm-decoder.hh".

diff --git a/ChangeLog b/ChangeLog
index 1f69d4963ed19ecc8f5e0bc603e95bb3a484d79b..c19eff62afe8805202c7a519d37c74ce9260bc73 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@
        * lily/lily-guile.cc: 
        * lily/pangofc-afm-decoder.cc:
        * lily/include/pangofc-afm-decoder.hh: Use #if HAVE_* iso #ifdef.
-       Fixes build without Pango CVS.
+       Fixes build without Pango CVS.  Use "pangofc-afm-decoder.hh".
 
        * Documentation/topdocs/NEWS.texi (Top): Mention GNOME backend for
        developers.

diff --git a/config.hh.in b/config.hh.in
index fe37006e49346aa15c4125885ce978b44761317f..2f8ec4b0074e7d8855f4d934e94f02a2ed26f8e9 100644 (file)
--- a/config.hh.in
+++ b/config.hh.in
@@ -92,5 +92,8 @@
 #endif
 #endif
 
+/* define if you have pango CVS */
+#define HAVE_PANGO_CVS 0
+
 /* define if you have pango_fc_font_map_add_decoder_find_func */
 #define HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC 0

diff --git a/lily/pangofc-afm-decoder.cc b/lily/pangofc-afm-decoder.cc
index 92545bde619870264c1c4a8f3d0de2ecd3ff5d8b..c7e2ef1aac59950d56e840c071da0ecc08316522 100644 (file)
--- a/lily/pangofc-afm-decoder.cc
+++ b/lily/pangofc-afm-decoder.cc
@@ -234,7 +234,7 @@ pango_fc_afm_add_decoder (char const *family_name)
 #include <pango/pangox.h>
 #include <pango/pangoxft.h>
 
-#include "pangofc-afm-decoder.h"
+#include "pangofc-afm-decoder.hh"
 
 #define CANVAS_WIDTH 600
 #define CANVAS_HEIGHT 300