* 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.

diff --git a/ChangeLog b/ChangeLog
index d88d9062a497fd07e7eadb3c522cf625f47eb6d7..1f69d4963ed19ecc8f5e0bc603e95bb3a484d79b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-06-17  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * 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.
+
        * Documentation/topdocs/NEWS.texi (Top): Mention GNOME backend for
        developers.
 

diff --git a/lily/include/pangofc-afm-decoder.hh b/lily/include/pangofc-afm-decoder.hh
index b9fb6162f3dd1ae797205df2797fe4fedfa01643..cde2830b0bf71d269cc530a42c6625e0657b8080 100644 (file)
--- a/lily/include/pangofc-afm-decoder.hh
+++ b/lily/include/pangofc-afm-decoder.hh
@@ -27,7 +27,7 @@
 #define __PANGOFC_AFM_DECODER_H__
 
 #include "config.h"
-#ifdef HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC
+#if HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC
 
 /* Note: in C and with explicit header for use outside of LilyPond.  */
 

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 5c9d9b6b2116864ee73a51d5da26622b68556d1a..47be547d79184b367e474f9abada0777f0df1f73 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -781,7 +781,7 @@ LY_DEFINE (ly_protects, "ly:protects",
 #endif
 
 
-#ifdef HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC
+#if HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC
 
 #include "pangofc-afm-decoder.hh"
 

diff --git a/lily/pangofc-afm-decoder.cc b/lily/pangofc-afm-decoder.cc
index 184418bfbf7ec513061cae25300ab0f0352dadb9..92545bde619870264c1c4a8f3d0de2ecd3ff5d8b 100644 (file)
--- a/lily/pangofc-afm-decoder.cc
+++ b/lily/pangofc-afm-decoder.cc
@@ -24,7 +24,7 @@
 */
 
 #include "config.h"
-#ifdef HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC
+#if HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC
 
 /* Need to access to PangoFcFont.full_pattern.  */
 #define PANGO_ENABLE_BACKEND