Ticket #7705: OSX_10.6_mythtv_22953.patch

configure

@@ -3426 +3426 @@
 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."
 
-if $(pkg-config --atleast-version 4.4.0 QtWebKit) ; then
+if `which pkg-config` && $(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)"
+    qt_inc="${sysroot}/$(${qmake} -query QT_INSTALL_HEADERS)"
 
-    check_cxx ${qt_inc} <<EOF && enable qtwebkit
-#include <QtWebKit/QtWebKit>
+    check_cxx -I${qt_inc}/QtCore -I${qt_inc}/QtWebKit <<EOF && enable qtwebkit
+#include <QtWebKit>
 #if QT_VERSION < 0x040400
 die
 #endif

libs/libmythui/libmythui.pro

@@ -79 +79 @@
 }
 
 macx {
+    # Mac OS X Frameworks
+    FWKS = ApplicationServices Carbon IOKit
+
+    # The following trick shortens the command line, but depends on
+    # the shell expanding Csh-style braces. Luckily, Bash and Zsh do.
+    FC = $$join(FWKS,",","{","}")
+
+    QMAKE_CXXFLAGS += -F/System/Library/Frameworks/$${FC}.framework/Frameworks
+    LIBS           += -framework $$join(FWKS," -framework ")
+
     HEADERS += screensaver-osx.h   DisplayResOSX.h   util-osx.h
     SOURCES += screensaver-osx.cpp DisplayResOSX.cpp util-osx.cpp
 
-    QMAKE_CXXFLAGS += -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks
-    QMAKE_CXXFLAGS += -F/System/Library/Frameworks/Carbon.framework/Frameworks
-    LIBS           += -framework IOKit
-
     using_appleremote {
         HEADERS += AppleRemote.h   AppleRemoteListener.h
         SOURCES += AppleRemote.cpp AppleRemoteListener.cpp

programs/programs.pro

@@ -18 +18 @@
 }
 
 mingw: SUBDIRS -= mythtranscode mythtranscode/replex
+# Nigel's speedup hack:
+SUBDIRS = mythfrontend mythavtest