[Pkg-telepathy-commits] [empathy] 05/08: Test whether to enable Linux-specifics via host OS, not build OS

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch telepathy1
in repository empathy.

commit 9033c7dcc581a3fb63f5cfeac813bfe592b96774
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Mar 27 11:06:27 2014 +0000

    Test whether to enable Linux-specifics via host OS, not build OS
    
    In case you're cross-compiling for kFreeBSD on a Linux build machine,
    or whatever.
---
 debian/changelog | 3 +++
 debian/rules     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5a8e58f..e7f9298 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ empathy (3.12.0-1) UNRELEASED; urgency=medium
   * Reset gbp.conf for unstable
   * Run autoreconf on /telepathy-account-widgets as well as /
   * Use default.mk for architecture variables
+  * Test whether to enable Linux-specifics via host OS, not build OS
+    (in case you're cross-compiling for kFreeBSD on a Linux build machine,
+    or whatever)
 
  -- Laurent Bigonville <bigon at debian.org>  Mon, 24 Mar 2014 18:16:07 +0100
 
diff --git a/debian/rules b/debian/rules
index 1b6bc86..ff3ee69 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-spell=yes \
                              --enable-map=yes \
                              --enable-goa=yes
 
-ifeq ($(DEB_BUILD_ARCH_OS),linux)
+ifeq ($(DEB_HOST_ARCH_OS),linux)
   DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=nm --enable-gudev=yes
 else
   DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=no --enable-gudev=no

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/empathy.git