summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.in6
-rw-r--r--tests/cxx-test.C4
3 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 26f39082..5cd54626 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-06-18 Behdad Esfahbod <behdad@gnome.org>
+ * configure.in:
+ * tests/cxx-test.C: Include pangocairo.h too.
+
+2007-06-18 Behdad Esfahbod <behdad@gnome.org>
+
Bug 447568 – improve docs on what absolute size means
* pango/fonts.c: Improve docs.
diff --git a/configure.in b/configure.in
index 4ee4e714..d959beba 100644
--- a/configure.in
+++ b/configure.in
@@ -383,6 +383,10 @@ if $have_cairo ; then
have_cairo=true
fi
+ if $have_cairo ; then
+ AC_DEFINE(HAVE_CAIRO, 1, [Have usable Cairo library and font backend])
+ fi
+
LDFLAGS=$pango_save_ldflags
fi
@@ -402,7 +406,7 @@ AM_CONDITIONAL(HAVE_CAIRO_ATSUI, $have_cairo_atsui && $have_atsui)
# patch to fix that rule. :-)
#
if $have_freetype || $have_x || $have_xft || $have_win32 || $have_cairo_atsui ; then : ; else
- AC_MSG_ERROR([*** Didn't find any of FreeType, X11, ATSUI or Win32.
+ AC_MSG_ERROR([*** Didn't find any of FreeType, X11, ATSUI, or Win32.
*** Must have at least one backend to build Pango.])
fi
diff --git a/tests/cxx-test.C b/tests/cxx-test.C
index ab9aaa4b..62099b3b 100644
--- a/tests/cxx-test.C
+++ b/tests/cxx-test.C
@@ -22,6 +22,10 @@
#include <pango/pangoft2.h>
#endif
+#ifdef HAVE_CAIRO
+#include <pango/pangocairo.h>
+#endif
+
int
main ()
{