Skip to content

Commit

Permalink
backports [24638] from trunk
Browse files Browse the repository at this point in the history
configure: check linking for QtDBus
    
Fix false positive on windows since the Qt package contains the headers.
Fixes #8121


git-svn-id: http://svn.mythtv.org/svn/branches/release-0-23-fixes@24836 7dbf422c-18fa-0310-86e9-fd20926502f2
  • Loading branch information
jannau committed May 24, 2010
1 parent 789f388 commit 4ad1cee
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions mythtv/configure
Original file line number Diff line number Diff line change
Expand Up @@ -3763,12 +3763,13 @@ enabled freetype2 ||
enabled lamemp3 && check_lib2 lame/lame.h lame_init -lmp3lame -lm ||
die "ERROR! You must have the Lame MP3 encoding library installed to compile MythTV."

# Qt dependency checks
qt_inc="-I${sysroot}/$(${qmake} -query QT_INSTALL_HEADERS)"
qt_libs="-L${sysroot}/$(${qmake} -query QT_INSTALL_LIBS)"

if $(pkg-config --atleast-version 4.4.0 QtWebKit) ; then
enable qtwebkit
else
# For environments that don't have pkg-config, we do a compile test.
qt_inc="-I${sysroot}/$(${qmake} -query QT_INSTALL_HEADERS)"

check_cxx ${qt_inc} ${qt_inc}/QtCore <<EOF && enable qtwebkit
#include <QtWebKit/QtWebKit>
#if QT_VERSION < 0x040400
Expand All @@ -3780,9 +3781,11 @@ fi
enabled qtwebkit || die "Error! QtWebkit headers not found"

# Check if Qt was built with DBus support:
qt_inc="-I${sysroot}/$(${qmake} -query QT_INSTALL_HEADERS)"
check_cxx ${qt_inc} ${qt_inc}/QtDBus <<EOF && enable qtdbus
check_ld_cxx ${qt_inc} ${qt_inc}/QtDBus ${qt_libs} -lQtDBus <<EOF && enable qtdbus
#include <QtDBus>
int main(void){
return (long) QDBusConnection::disconnectFromBus;
}
EOF

if enabled firewire; then
Expand Down

0 comments on commit 4ad1cee

Please sign in to comment.