diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2007-06-19 03:27:12 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2007-06-19 03:27:12 +0000 |
| commit | 9fccf5b6a4b72e95bc6ad5a5545ab3e03317f46b (patch) | |
| tree | 8ec5373a6989dcb55ffbd92d7f59bb77f63dbda1 | |
| parent | df64ec2aaf6a397144c08d92ce63a457fc309c67 (diff) | |
| download | pango-9fccf5b6a4b72e95bc6ad5a5545ab3e03317f46b.tar.gz | |
Include pangocairo.h too.
2007-06-18 Behdad Esfahbod <behdad@gnome.org>
* configure.in:
* tests/cxx-test.C: Include pangocairo.h too.
svn path=/trunk/; revision=2358
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | tests/cxx-test.C | 4 |
3 files changed, 14 insertions, 1 deletions
@@ -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 () { |