[gtk+] build: fix win32 configure checks
- From: Marc-Andre Lureau <malureau src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] build: fix win32 configure checks
- Date: Fri, 10 Jun 2011 18:22:50 +0000 (UTC)
commit 9bdcffd271fb7c1e023c37ca296b3aac5601db5d
Author: Marc-André Lureau <marcandre lureau redhat com>
Date: Fri Jun 10 14:03:47 2011 +0200
build: fix win32 configure checks
Notice the broken check for "os_win32" vs. "$os_win32".
Improve a bit the rest of autofoo stuff around it.
https://bugzilla.gnome.org/show_bug.cgi?id=652282
configure.ac | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 22943e3..f950f75 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1519,16 +1519,29 @@ GOBJECT_INTROSPECTION_CHECK(introspection_required_version)
#################################################
AC_ARG_ENABLE(packagekit,
- [AS_HELP_STRING([--disable-packagekit],
- [build packagekit open-with module])])
+ [AS_HELP_STRING([--enable-packagekit=@<:@yes/no/auto@:>@],
+ [build packagekit open-with module [default=auto]])],
+ [enable_packagekit="$enableval"],
+ [enable_packagekit=auto])
+if test "$enable_packagekit" = "auto"; then
+ if test "$os_win32" = "yes"; then
+ enable_packagekit=no
+ else
+ enable_packagekit=yes
+ fi
+fi
+AC_MSG_CHECKING([Whether to use PackageKit])
build_packagekit=no
-if test "os_win32" != "yes"; then
- if test "x$enable_packagekit" != "xno"; then
- build_packagekit=yes
- AC_DEFINE(ENABLE_PACKAGEKIT, 1, [define to enable packagekit])
- fi
+if test "x$enable_packagekit" != "xno"; then
+ if test "$os_win32" != "yes"; then
+ build_packagekit=yes
+ AC_DEFINE(ENABLE_PACKAGEKIT, 1, [define to enable packagekit])
+ else
+ AC_MSG_ERROR([packagekit support is not available on win32])
+ fi
fi
+AC_MSG_RESULT([$build_packagekit])
AM_CONDITIONAL(ENABLE_PACKAGEKIT, test "x$build_packagekit" = "xyes")
@@ -1537,12 +1550,22 @@ AM_CONDITIONAL(ENABLE_PACKAGEKIT, test "x$build_packagekit" = "xyes")
#################################################
AC_ARG_ENABLE(colord,
- [AS_HELP_STRING([--disable-colord],
- [build colord support code])])
+ [AS_HELP_STRING([--enable-colord=@<:@yes/no/auto@:>@],
+ [build colord support code [default=auto]])],
+ [enable_colord="$enableval"],
+ [enable_colord=auto])
+if test "$enable_colord" = "auto"; then
+ if test "$os_win32" = "yes"; then
+ enable_colord=no
+ else
+ enable_colord=yes
+ fi
+fi
+AC_MSG_CHECKING([Whether to use colord])
have_colord=no
if test "x$enable_colord" != "xno"; then
- if test "os_win32" != "yes"; then
+ if test "$os_win32" != "yes"; then
PKG_CHECK_MODULES(COLORD, colord >= 0.1.9,
have_colord=yes, have_colord=no)
if test "enable_colord" = "yes"; then
@@ -1554,6 +1577,7 @@ if test "x$enable_colord" != "xno"; then
AC_MSG_ERROR([colord support is not available on win32])
fi
fi
+AC_MSG_RESULT([$have_colord])
if test "have_colord" = "yes"; then
AC_DEFINE(HAVE_COLORD, 1, [define if we have colord])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]