diff options
| author | Johan Dahlin <johan@gnome.org> | 2010-04-20 23:04:47 -0300 |
|---|---|---|
| committer | Johan Dahlin <johan@gnome.org> | 2010-04-20 23:04:47 -0300 |
| commit | 5b896b3f93ffc8ecc10871e7665ab4dd1c71e91c (patch) | |
| tree | 5b22ff67f1f58f8934a6503455b597afd5d5fa61 /configure.ac | |
| parent | 172482e247cf82561291011f0285f79a063050c3 (diff) | |
| download | gobject-introspection-5b896b3f93ffc8ecc10871e7665ab4dd1c71e91c.tar.gz | |
[everything] Depend on cairo properly
Don't try to build the everything library nor the gir if we
can't find cairo. Pass in the right flags so it can be built
when cairo is not in the same prefix as the rest of the dependencies.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index b9d2b895..321c973d 100644 --- a/configure.ac +++ b/configure.ac @@ -126,6 +126,7 @@ PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0], have_gio_unix=true, have_gio_unix=fa AM_CONDITIONAL(HAVE_GIO_UNIX, test x$have_gio_unix = xtrue) AC_ARG_ENABLE(tests,[ --disable-tests disable test libraries ], enable_tests=$enableval,enable_tests=yes) +have_cairo=no if test x$enable_tests != xno; then PKG_CHECK_MODULES(CAIRO, [cairo], have_cairo=yes, have_cairo=no) if test x$have_cairo != xyes; then @@ -133,6 +134,7 @@ if test x$enable_tests != xno; then fi fi AM_CONDITIONAL(BUILD_TESTS, test x$enable_tests != xno) +AM_CONDITIONAL(HAVE_CAIRO, test x$have_cairo != xno) PKG_CHECK_MODULES(SCANNER, [gobject-2.0 gthread-2.0 gio-2.0]) |