[cairo-commit] build/Makefile.win32.features configure.ac

[Andrea Canciani]

 build/Makefile.win32.features |    2 +-
 configure.ac                  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f71a618bd2604c8f0beaf4816a38a54f6f271bd9
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Sat Aug 7 21:32:09 2010 +0200

    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.

diff --git a/build/Makefile.win32.features b/build/Makefile.win32.features
index c8f4a7c..d76cf0e 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 3c30841..631c1bd 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/)"])