X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour.sh.in;h=407c808a0e9d903f5ca958675905159361651ebe;hb=05149f9bc54d0cfb8b162ba7cfac975b5eb79971;hp=16061f5c09bab3e114a2756fdd032915e75f5a26;hpb=23e7cf10191270d70357ccf0ed9294f020c7b7ab;p=ardour.git

diff --git a/gtk2_ardour/ardour.sh.in b/gtk2_ardour/ardour.sh.in
index 16061f5c09..407c808a0e 100644
--- a/gtk2_ardour/ardour.sh.in
+++ b/gtk2_ardour/ardour.sh.in
@@ -23,9 +23,9 @@ fi
 
 ## Glib atomic test
 
-GLIB=$(ldd @LIBDIR@/ardour-@VERSION@ 2> /dev/null | grep glib-2.0 | sed 's/.*=> \([^ ]*\) .*/\1/')
+GLIB=$(ldd @LIBDIR@/ardour-@VERSION@ 2> /dev/null | grep glib-2.0 | sed 's/.*=> \([^ ]*\)/\1/;s/ .*//')
 
-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
@@ -60,5 +66,3 @@ if [ $# -gt 0 ] ; then
 fi
 
 exec $GDB @LIBDIR@/ardour-@VERSION@ "$@"
-
-