initial commit of hand merging, plus getting "ancient" waf script to work correctly

libs/canvas/run-manual-test.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+
+if [ ! -f './canvas.cc' ]; then
+    echo "This script must be run from within the libs/canvas directory";
+    exit 1;
+fi
+
+srcdir=`pwd`
+cd ../../build/default
+
+libs='libs'
+
+export LD_LIBRARY_PATH=$libs/audiographer:$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/timecode:$libs/canvas:$LD_LIBRARY_PATH
+
+if [ "$1" == "--debug" ]; then
+    gdb ./libs/canvas/test/$2
+else
+    ./libs/canvas/test/$1
+fi
+
+