* stepmake/aclocal.m4 (STEPMAKE_PANGO_FT2): Define HAVE_PANGO16 too.

[lilypond.git] / lily / include / all-font-metrics.hh

diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh
index f7af1bb4b94103cccbd41fe35eaa6f3ca4c4767e..a9982d7ba52d16e11e95450b5f05d01ad33ef54b 100644 (file)
--- a/lily/include/all-font-metrics.hh
+++ b/lily/include/all-font-metrics.hh
@@ -13,7 +13,7 @@
 #include "font-metric.hh"
 #include "config.hh"
 
-#ifdef HAVE_PANGO16
+#if HAVE_PANGO16
 #include <pango/pango.h>
 #include <pango/pangoft2.h>
 #endif
@@ -28,7 +28,7 @@ class All_font_metrics
   Scheme_hash_table *otf_dict_;
   File_path search_path_;
 
-#ifdef HAVE_PANGO_FT2
+#if HAVE_PANGO_FT2
   PangoFT2FontMap *pango_ft2_fontmap_;
   Scheme_hash_table *pango_dict_;
   int pango_dpi_;
@@ -39,7 +39,7 @@ public:
   All_font_metrics (String search_path);
   ~All_font_metrics ();
 
-#ifdef HAVE_PANGO_FT2
+#if HAVE_PANGO_FT2
   Pango_font *find_pango_font (PangoFontDescription *description,
                               Real magnification,
                               Real scale);