Skip to content

Instantly share code, notes, and snippets.

@mmisiewicz
Last active May 13, 2018 21:12
Show Gist options
  • Save mmisiewicz/59d2f51690dc72c3fde730ce505249a6 to your computer and use it in GitHub Desktop.
Save mmisiewicz/59d2f51690dc72c3fde730ce505249a6 to your computer and use it in GitHub Desktop.
index 0d5c540f5d..19dc358360 100755
--- a/mythtv/configure
+++ b/mythtv/configure
@@ -140,7 +140,8 @@ Advanced options (experts only):
--disable-libass disable libass SSA/ASS subtitle support
--disable-systemd_notify disable systemd notify support
--disable-systemd_journal disable systemd journal support
-
+ --disable-qtwebkit disable QT webkit support (for built in browser)
+
--enable-mac-bundle produce standalone OS X apps (e.g. mythfrontend.app)
--disable-libxml2 disable libxml2 support (disc metadata)
@@ -4723,6 +4724,7 @@ case $target_os in
disable v4l1
disable v4l2
disable x11
+ disable qtwebkit
# Workaround compile errors from missing u_int/uint def
CFLAGS=`echo $CFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'`
CPPFLAGS=`echo $CPPFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'`
@@ -6371,17 +6373,17 @@ else
qt_libs="-L${sysroot}/$(${qmake} -query QT_INSTALL_LIBS)"
fi
-if $(pkg-config --exists Qt5WebKit) || $(pkg-config --exists QtWebKit) ; then
- enable qtwebkit
-else
- check_ecxx ${qt_inc} ${qt_inc}/QtCore <<EOF && enable qtwebkit
+if ! disabled qtwebkit; then
+ if $(pkg-config --exists Qt5WebKit) || $(pkg-config --exists QtWebKit) ; then
+ enable qtwebkit
+ else
+ check_ecxx ${qt_inc} ${qt_inc}/QtCore <<EOF && enable qtwebkit
#include <QtWebKit/QtWebKit>
int main(void){ return 0; }
EOF
+ fi
fi
-enabled qtwebkit || die "Error! QtWebkit headers not found"
-
if $(pkg-config --exists Qt5Script) || $(pkg-config --exists QtScript) ; then
enable qtscript
else
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment