From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 17 Jun 2004 13:48:12 +0000 (+0000)
Subject: * lily/lily-guile.cc:
X-Git-Tag: release/2.2.3~1^2~15
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b640feca11c0d63e7bb8b321d9cbe5de2b7feca6;p=lilypond.git

* 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 1f69d4963e..c19eff62af 100644
--- 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 fe37006e49..2f8ec4b007 100644
--- 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 92545bde61..c7e2ef1aac 100644
--- 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