Permalink
Browse files

Add + use a check_ecxx() so we can check for Qt stuff using the requi…

…red compiler flags to check this with qt5.
  • Loading branch information...
daniel-kristjansson authored and jyavenard committed Feb 24, 2013
1 parent ade8868 commit 0f6daeba87f0a254cea9955c6d01def9b16b60bb
Showing with 10 additions and 3 deletions.
  1. +10 −3 mythtv/configure
View
@@ -843,6 +843,13 @@ check_cxx(){
check_cmd $cxx $CPPFLAGS $CXXFLAGS "$@" $CXX_C -o $TMPO $TMPCPP
}
check_ecxx(){
log check_cxx "$@"
cat > $TMPCPP
log_file $TMPCPP
check_cmd $cxx $CPPFLAGS $CXXFLAGS $ECXXFLAGS "$@" $CXX_C -o $TMPO $TMPCPP
}
check_cpp(){
log check_cpp "$@"
cat > $TMPC
@@ -5275,7 +5282,7 @@ fi
if $(pkg-config --exists QtWebKit) ; then
enable qtwebkit
else
check_cxx ${qt_inc} ${qt_inc}/QtCore <<EOF && enable qtwebkit
check_ecxx ${qt_inc} ${qt_inc}/QtCore <<EOF && enable qtwebkit
#include <QtWebKit/QtWebKit>
int main(void){ return 0; }
EOF
@@ -5286,7 +5293,7 @@ enabled qtwebkit || die "Error! QtWebkit headers not found"
if $(pkg-config --exists QtScript) ; then
enable qtscript
else
check_cxx ${qt_inc} <<EOF && enable qtscript
check_ecxx ${qt_inc} <<EOF && enable qtscript
#include <QtScript/QtScript>
int main(void){ return 0; }
EOF
@@ -5299,7 +5306,7 @@ if ! disabled qtdbus; then
if $(pkg-config --exists QtDBus) ; then
enable qtdbus
else
check_cxx ${qt_inc} <<EOF && enable qtdbus
check_ecxx ${qt_inc} <<EOF && enable qtdbus
#include <QtDBus/QtDBus>
#include <QtDBus/QDBusInterface>
int main(void)

0 comments on commit 0f6daeb

Please sign in to comment.