Merge with trunk R2935.

git-svn-id: svn://localhost/ardour2/branches/3.0@2943 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 16 insertions, 11 deletions

diff --git a/tools/osx_packaging/script b/tools/osx_packaging/script
index faf92eded8..b003337418 100755
--- a/tools/osx_packaging/script
+++ b/tools/osx_packaging/script
@@ -32,17 +32,22 @@ if [ "$?" != "0" -a ! -f ~/.xinitrc ]; then
     sed 's/xterm/# xterm/' /usr/X11R6/lib/X11/xinit/xinitrc >> ~/.xinitrc
 fi
 
-mkdir -p $TMP
-cp -f "$CWD/bin/getdisplay.sh" $TMP
-rm -f $TMP/display
-open-x11 $TMP/getdisplay.sh || \
-open -a XDarwin $TMP/getdisplay.sh || \
-echo ":0" > $TMP/display
-
-while [ "$?" == "0" -a ! -f $TMP/display ]; do sleep 1; done
-export "DISPLAY=`cat $TMP/display`"
-
-ps -wx -ocommand | grep -e '[X]11' > /dev/null || exit 11
+if uname -r | grep -sq '^9' ; then
+    # leopard will auto-start X11 for us
+    :
+else 
+    mkdir -p $TMP
+    cp -f "$CWD/bin/getdisplay.sh" $TMP
+    rm -f $TMP/display
+    open-x11 $TMP/getdisplay.sh || \
+	open -a XDarwin $TMP/getdisplay.sh || \
+	echo ":0" > $TMP/display
+
+    while [ "$?" == "0" -a ! -f $TMP/display ]; do sleep 1; done
+    export "DISPLAY=`cat $TMP/display`"
+
+    ps -wx -ocommand | grep -e '[X]11' > /dev/null || exit 11
+fi
 
 cd ~/
 shift