summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2007-05-10 02:23:12 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2007-05-10 02:23:12 +0000
commit7f64e5ac4cec85859aa162fcdad0cc91cb015561 (patch)
tree2da263177b2d5386fcf234fb20884bcaa755501a /tools
parent1e7bcd8b0fd451117e241bf49660684314b5757f (diff)
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
Diffstat (limited to 'tools')
-rwxr-xr-xtools/osx_packaging/script21
1 files changed, 21 insertions, 0 deletions
diff --git a/tools/osx_packaging/script b/tools/osx_packaging/script
index ec6ad4feec..faf92eded8 100755
--- a/tools/osx_packaging/script
+++ b/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