merge changes for 2.0.1/2.0.2, plus some fixes to issues made apparent by conflicts

git-svn-id: svn://localhost/ardour2/branches/midi@1812 d708f5d6-7413-0410-9779-e7cbd77b26cf

tools/osx_packaging/script

@@ -2,6 +2,27 @@
 #
 # Author: Aaron Voisine <aaron@voisine.org>
 
+if [ ! -x /Applications/Utilities/X11.app ] ; then
+    if [ -f /usr/include/X11/X.h ] ; then
+	osascript -e 'tell application "Ardour2"
+display dialog "You have installed the X11 SDK, but not X11 itself.\
+Please install X11 before running Ardour" buttons["OK"]
+end tell'
+    else
+	osascript -e 'tell application "Ardour2"
+display dialog "Please install X11 before running Ardour" buttons["OK"]
+end tell'
+    fi
+    exit 1
+fi
+
+if [ ! -x /usr/local/bin/jackd -a ! -x /usr/bin/jackd ] ; then
+    osascript -e 'tell application "Ardour2"
+display dialog "You do not appear to have JACK installed.\nPlease install it before running Ardour" buttons["OK"]
+end tell'
+    exit 1
+fi
+
 CWD="`dirname \"$0\"`"
 TMP=/tmp/$UID/TemporaryItems