callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: fix win32 configure checks

Browse Source 
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
This commit is contained in:
Marc-André Lureau
2011-06-10 14:03:47 +02:00
parent 7adfd8a0f5
commit 9bdcffd271
1 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
configure.ac
View File

@ -1519,17 +1519,30 @@ GOBJECT_INTROSPECTION_CHECK(introspection_required_version)
#################################################
AC_ARG_ENABLE(packagekit,
[AS_HELP_STRING([--disable-packagekit],
[build packagekit open-with module])])
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
[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 "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])