OSX build fixes

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2957 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/cocoacarbon.mm b/gtk2_ardour/cocoacarbon.mm
index b60352eb47b226bbe2a4efb94ef67dba4a0bb695..6317cec6c6a393e1e43fac8747d320f9542d231a 100644 (file)
--- a/gtk2_ardour/cocoacarbon.mm
+++ b/gtk2_ardour/cocoacarbon.mm
@@ -18,6 +18,8 @@
 
 #include <Carbon/Carbon.h>
 #undef check // stupid, stupid carbon
+#undef YES   // stupid, stupid gtkmm and/or NSObjC
+#undef NO    // ditto
 
 #include "ardour_ui.h"
 #include "actions.h"
@@ -117,6 +119,6 @@ ARDOUR_UI::platform_setup ()
                
                /* if invoked from the command line, make sure we're visible */
                
-               [NSApp activateIgnoringOtherApps:YES];
+               [NSApp activateIgnoringOtherApps:1];
        } 
 }

diff --git a/libs/glibmm2/autogen.sh b/libs/glibmm2/autogen.sh
index f2f287d325f12511b4945c4ef73e90615353f1bc..563cdad3a3fae20deed4d405294a47c7c89ea213 100755 (executable)
--- a/libs/glibmm2/autogen.sh
+++ b/libs/glibmm2/autogen.sh
@@ -2,11 +2,17 @@
 
 # check all tools first
 
+LIBTOOLIZE=libtoolize
+
 if /usr/bin/which libtoolize >/dev/null 2>&1 ; then 
     : 
 else 
-    echo "You do not have libtool installed, which is very sadly required to build part of Ardour" 
-    exit 1
+    if /usr/bin/which glibtoolize >/dev/null 2>&1 ; then
+       LIBTOOLIZE=glibtoolize
+    else
+       echo "You do not have libtool installed, which is very sadly required to build part of Ardour" 
+       exit 1
+    fi
 fi
 if /usr/bin/which automake >/dev/null 2>&1 ; then 
     : 
@@ -26,7 +32,7 @@ srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
 echo "Adding libtools."
-libtoolize --automake --copy --force
+$LIBTOOLIZE --automake --copy --force
 
 echo "Building macros."
 aclocal  -I "$srcdir/scripts" $ACLOCAL_FLAGS

diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index ff08c7e933e2d55010e87a3cd1e8dbd880101a3c..4160b07d5614056b3ac50398c21267de9bda96cc 100755 (executable)
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -107,7 +107,6 @@ if test x$WITH_JACK != x ; then
     cp /usr/local/lib/jack/jack_coreaudio.so $Frameworks
     cp /usr/local/bin/jackd $APPROOT/MacOS
 fi
-cp ../../gtk2_ardour/evtest $APPROOT/MacOS/gtkevents
 
 cp -R $GTKQUARTZ_ROOT/etc/* $Etc
 echo "Copying all Pango modules ..."
@@ -203,7 +202,7 @@ done
 
 # now fix up the executables
 echo "Fixing up executable dependency names ..."
-executables="Ardour2 gtkevents"
+executables="Ardour2"
 if test x$WITH_JACK != x ; then
     executables="$executables jackd"
 fi