a more reliable/robust/less complex version of previous commit

[ardour.git] / gtk2_ardour / ardour.sh.in

diff --git a/gtk2_ardour/ardour.sh.in b/gtk2_ardour/ardour.sh.in
index 16061f5c09bab3e114a2756fdd032915e75f5a26..8bcad1bf6ef08632e0f6576885f35001c731806d 100644 (file)
--- a/gtk2_ardour/ardour.sh.in
+++ b/gtk2_ardour/ardour.sh.in
@@ -25,7 +25,7 @@ fi
 
 GLIB=$(ldd @LIBDIR@/ardour-@VERSION@ 2> /dev/null | grep glib-2.0 | sed 's/.*=> \([^ ]*\) .*/\1/')
 
-if [ "$GLIB" = "" ]; then
+if ! type nm >/dev/null 2>&1 || [ "$GLIB" = "" ]; then
        echo "WARNING: Could not check your glib-2.0 for mutex locking atomic operations."
        echo ""
 elif [ $(nm -D --radix=dec --defined-only -S $GLIB | grep -w g_atomic_int_add | cut -d ' ' -f 2) -gt 32 ]; then
@@ -47,11 +47,17 @@ export ARDOUR_DATA_PATH=@DATADIR@
 export ARDOUR_CONFIG_PATH=@CONFDIR@
 export ARDOUR_DLL_PATH=@LIBDIR@
 
+#
+# NSM needs a path to this script
+#
+
+export ARDOUR_SELF="$0"
+
 #
 # VAMP has its own lookup path
 # 
 
-export VAMP_PATH=@LIBDIR@/vamp
+export VAMP_PATH=@LIBDIR@/vamp${VAMP_PATH:+:$VAMP_PATH}
 
 if [ $# -gt 0 ] ; then
     case $1 in