diff options
| author | Andrea Canciani <ranma42@gmail.com> | 2010-08-07 21:32:09 +0200 |
|---|---|---|
| committer | Andrea Canciani <ranma42@gmail.com> | 2010-08-07 21:32:09 +0200 |
| commit | f71a618bd2604c8f0beaf4816a38a54f6f271bd9 (patch) | |
| tree | 38b1c1f5a793f162506eb6dfb4612823844d56f7 | |
| parent | 661f4859cdbc0394ed0a9db34ced0f4e2bbe78ff (diff) | |
Fix configuration if gobject is absent
Autodetect gobject and only use it if present.
Its absence is not to be considered a failure since it's not required.
| -rw-r--r-- | build/Makefile.win32.features | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/Makefile.win32.features b/build/Makefile.win32.features index c8f4a7c5f..d76cf0ef8 100644 --- a/build/Makefile.win32.features +++ b/build/Makefile.win32.features @@ -35,7 +35,7 @@ CAIRO_HAS_TEST_SURFACES=0 CAIRO_HAS_TEE_SURFACE=0 CAIRO_HAS_XML_SURFACE=0 CAIRO_HAS_PTHREAD=0 -CAIRO_HAS_GOBJECT_FUNCTIONS=1 +CAIRO_HAS_GOBJECT_FUNCTIONS=0 CAIRO_HAS_TRACE=0 CAIRO_HAS_INTERPRETER=1 CAIRO_HAS_SYMBOL_LOOKUP=0 diff --git a/configure.ac b/configure.ac index 3c3084144..631c1bd5f 100644 --- a/configure.ac +++ b/configure.ac @@ -654,7 +654,7 @@ AC_SUBST(real_pthread_LIBS) dnl =========================================================================== dnl Build gobject integration library -CAIRO_ENABLE_FUNCTIONS(gobject, gobject, yes, [ +CAIRO_ENABLE_FUNCTIONS(gobject, gobject, auto, [ gobject_REQUIRES="gobject-2.0" PKG_CHECK_MODULES(gobject, $gobject_REQUIRES, , [AC_MSG_RESULT(no) use_gobject="no (requires $gobject_REQUIRES http://download.gnome.org/pub/GNOME/sources/glib/)"]) |