From c9acd0e4f20bd9e8e8f7845c66bbdae18c208d8f Mon Sep 17 00:00:00 2001
From: Lawrence Rust <lvr@softsystem.co.uk>
Date: Sun, 11 Sep 2011 16:03:17 +0200
Subject: [PATCH] configure: Fix checks for QtDBus
commit 9bf9ec907e added some fixes to the configure script to check for
QtDBus on Windows using pkg-config and compile time checks. However, when
cross-compiling pkg-config can wrongly enable QtDBus by detecting to the
host's QtDBus setup. This fix skips all DBus checks if the qtdbus variable
is disabled, which it is is the target-os is mingw32.
Signed-off-by: Lawrence Rust <lvr@softsystem.co.uk>
---
mythtv/configure | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/mythtv/configure b/mythtv/configure
index 9d05a5a..87980cf 100755
a
|
b
|
fi |
4064 | 4064 | enabled qtscript || die "Error! QtScript headers not found" |
4065 | 4065 | |
4066 | 4066 | # Check if Qt was built with DBus support: |
4067 | | if $(pkg-config --exists QtDBus) ; then |
| 4067 | ! disabled qtdbus && if $(pkg-config --exists QtDBus) ; then |
4068 | 4068 | enable qtdbus |
4069 | 4069 | else |
4070 | 4070 | check_cxx ${qt_inc} <<EOF && enable qtdbus |