From 01a3a80d4ef5e2319ea9f928dd71db0999ebb453 Mon Sep 17 00:00:00 2001 From: Nicola Fontana Date: Fri, 5 Apr 2013 00:21:36 +0200 Subject: [PATCH] adg: make cairo-gobject optional cairo-gobject has been added to cairo only recently (2010), so including it only optionally. In case it does not exist, use the yet existing fallbacks (or provide the missing ones if there will be). --- configure.ac | 5 ++++- src/adg/adg-internal.h | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 97ae6389..c612449c 100644 --- a/configure.ac +++ b/configure.ac @@ -132,7 +132,10 @@ AC_CONFIG_COMMANDS([default], PKG_CHECK_MODULES([GLIB],[glib-2.0]) PKG_CHECK_MODULES([GOBJECT],[gobject-2.0 >= ]gobject_prereq) PKG_CHECK_MODULES([CAIRO],[cairo >= ]cairo_prereq) -PKG_CHECK_MODULES([CAIRO_GOBJECT],[cairo-gobject >= ]cairo_gobject_prereq) +PKG_CHECK_MODULES([CAIRO_GOBJECT],[cairo-gobject], + [AC_DEFINE_UNQUOTED([CAIRO_GOBJECT_ENABLED],[1], + [Defined if GObject support in cairo is present.])], + [:]) # Check for optional packages diff --git a/src/adg/adg-internal.h b/src/adg/adg-internal.h index 0a739f55..d2ccac50 100644 --- a/src/adg/adg-internal.h +++ b/src/adg/adg-internal.h @@ -33,7 +33,11 @@ #include #define G_LOG_DOMAIN PACKAGE + +#ifdef CAIRO_GOBJECT_ENABLED #include +#endif + #include /* The following headers are autogenerated, so they could be hosted -- 2.11.4.GIT