[gtk+] If --enable-colord or --disable-colord is not used when configuring, autodetect the presence of colo
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] If --enable-colord or --disable-colord is not used when configuring, autodetect the presence of colo
- Date: Fri, 10 Jun 2011 11:36:52 +0000 (UTC)
commit 7a328b377c50a0ba527a497010216f42aec31b91
Author: Richard Hughes <richard hughsie com>
Date: Fri Jun 10 12:34:40 2011 +0100
If --enable-colord or --disable-colord is not used when configuring, autodetect the presence of colord
configure.ac | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 77a6cee..22943e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1543,14 +1543,21 @@ AC_ARG_ENABLE(colord,
have_colord=no
if test "x$enable_colord" != "xno"; then
if test "os_win32" != "yes"; then
- PKG_CHECK_MODULES(COLORD, colord >= 0.1.9)
- have_colord=yes
- AC_DEFINE(HAVE_COLORD, 1, [define if we have colord])
+ PKG_CHECK_MODULES(COLORD, colord >= 0.1.9,
+ have_colord=yes, have_colord=no)
+ if test "enable_colord" = "yes"; then
+ if test "have_colord" = "no"; then
+ AC_MSG_ERROR([--enable-colord specified, but not available])
+ fi
+ fi
else
AC_MSG_ERROR([colord support is not available on win32])
fi
fi
+if test "have_colord" = "yes"; then
+ AC_DEFINE(HAVE_COLORD, 1, [define if we have colord])
+fi
AM_CONDITIONAL(HAVE_COLORD, test "x$have_colord" = "xyes")
##################################################
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]