[gnome-bluetooth] build: fix nautilus-sendto configuration
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-bluetooth] build: fix nautilus-sendto configuration
- Date: Thu, 4 Nov 2010 19:48:48 +0000 (UTC)
commit 414f569be490dadbc210d3cf1cf2b5b647931f67
Author: Dan Winship <danw gnome org>
Date: Thu Nov 4 15:27:08 2010 -0400
build: fix nautilus-sendto configuration
The code was invoking pkg-config incorrectly, causing the check for
nautilus-sendto to always fail. Fixing this then revealed that it was
previously also looking at the wrong configure variable name, causing
--disable-nautilus-sendto to be a no-op.
https://bugzilla.gnome.org/show_bug.cgi?id=634018
configure.ac | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index df88496..3939e59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,19 +106,19 @@ PKG_CHECK_MODULES(SENDTO,
dnl nautilus-sendto plugin
AC_ARG_ENABLE(nautilus-sendto,
AS_HELP_STRING([--enable-nautilus-sendto=@<:@no/yes/auto@:>@],
- [build nautilus-sendto plugin]), ,
- enable_nst=auto)
+ [build nautilus-sendto plugin]))
-if test "x$enable_nst" != "xno"; then
+if test "x$enable_nautilus_sendto" != "xno"; then
PKG_CHECK_MODULES(NST,
[
- nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED < NAUTILUS_SENDTO_MAX_REQUIRED
+ nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED
+ nautilus-sendto < $NAUTILUS_SENDTO_MAX_REQUIRED
], have_nst="yes", have_nst="no")
else
have_nst=no
fi
-if test "x$enable_nst" = "xyes" -a "x$have_nst" != "xyes"; then
+if test "x$enable_nautilus_sendto" = "xyes" -a "x$have_nst" != "xyes"; then
AC_MSG_ERROR([Couldn't find nautilus-sendto dependencies.])
fi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]