[gjs] build: Allow disabling cairo
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs] build: Allow disabling cairo
- Date: Thu, 6 Dec 2012 22:00:31 +0000 (UTC)
commit 5bcdc19d8f48f40d644364b25cde85faecc0e93b
Author: Colin Walters <walters verbum org>
Date: Thu Dec 6 16:44:00 2012 -0500
build: Allow disabling cairo
I want to use gjs on a server which doesn't have cairo installed.
https://bugzilla.gnome.org/show_bug.cgi?id=689815
Makefile-modules.am | 10 ++++++++--
configure.ac | 16 +++++++++++-----
2 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/Makefile-modules.am b/Makefile-modules.am
index b2ec685..29af3cb 100644
--- a/Makefile-modules.am
+++ b/Makefile-modules.am
@@ -13,12 +13,18 @@ dist_gjsjs_DATA += \
modules/lang.js \
modules/jsUnit.js \
modules/signals.js \
- modules/cairo.js \
modules/dbus.js \
modules/promise.js \
modules/format.js
-gjsnative_LTLIBRARIES += console.la debugger.la langNative.la mainloop.la gettextNative.la dbusNative.la cairoNative.la system.la formatNative.la
+gjsnative_LTLIBRARIES += console.la debugger.la langNative.la mainloop.la gettextNative.la dbusNative.la system.la formatNative.la
+
+if ENABLE_CAIRO
+dist_gjsjs_DATA += \
+ modules/cairo.js \
+ $(NULL)
+gjsnative_LTLIBRARIES += cairoNative.la
+endif
JS_NATIVE_MODULE_CFLAGS = \
$(AM_CFLAGS) \
diff --git a/configure.ac b/configure.ac
index 8cffc20..e0ac9f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,15 +109,21 @@ gjstests_packages="$gjstests_packages $gjs_packages"
PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= glib_required_version])
PKG_CHECK_MODULES([GJS], [$gjs_packages])
# Prefer cairo-gobject if we have it
-PKG_CHECK_MODULES([GJS_CAIRO], [$gjs_cairo_gobject_packages], have_cairo_gobject=yes, have_cairo_gobject=no)
-if test x${have_cairo_gobject} != xyes; then
- PKG_CHECK_MODULES([GJS_CAIRO], [$gjs_cairo_packages])
-fi
+AC_ARG_WITH(cairo,
+ AS_HELP_STRING([--without-cairo], [Use cairo @<:@default=yes@:>@]),
+ [], [with_cairo=yes])
+AS_IF([test x$with_cairo = xyes], [
+ PKG_CHECK_MODULES([GJS_CAIRO], [$gjs_cairo_gobject_packages], have_cairo_gobject=yes, have_cairo_gobject=no)
+ AS_IF([test x${have_cairo_gobject} != xyes], [
+ PKG_CHECK_MODULES([GJS_CAIRO], [$gjs_cairo_packages])
+ ])
+])
+AM_CONDITIONAL(ENABLE_CAIRO, test x$with_cairo = xyes)
PKG_CHECK_MODULES([GJS_DBUS], [$gjs_dbus_packages])
PKG_CHECK_MODULES([GJS_GDBUS], [$gjs_gdbus_packages])
AC_ARG_ENABLE(tests,[ --disable-tests disable test libraries ], enable_tests=$enableval,enable_tests=yes)
-AM_CONDITIONAL(ENABLE_TESTS, test x$enable_tests = xyes)
+AM_CONDITIONAL(ENABLE_TESTS, test x$with_cairo = xyes && test x$enable_tests = xyes)
saved_CFLAGS=$CFLAGS
CFLAGS=$GJS_DBUS_CFLAGS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]