Add a check for for jack function jack_port_ensure_monitor to

allow building successfully with older versions of jack.


git-svn-id: svn://localhost/ardour2/trunk@876 d708f5d6-7413-0410-9779-e7cbd77b26cf

SConstruct

@@ -467,6 +467,17 @@ if conf.CheckHeader ('boost/shared_ptr.hpp', language='CXX') == 0:
     
 libraries['boost'] = conf.Finish ()
 
+conf = env.Configure ()
+
+# jack_port_ensure_monitor available
+
+if conf.CheckFunc('jack_port_ensure_monitor'):
+    env.Append(CCFLAGS='-DWITH_JACK_PORT_ENSURE_MONITOR')
+else:
+    print '\nWARNING: You need at least svn revision 985 of jack for hardware monitoring to work correctly.\n'
+
+env = conf.Finish()
+
 #
 # Check for liblo
 

libs/ardour/ardour/port.h

@@ -136,7 +136,13 @@ class Port : public sigc::trackable {
 	}
 	
 	void ensure_monitor_input (bool yn) {
+
+#ifdef WITH_JACK_PORT_ENSURE_MONITOR
 		jack_port_ensure_monitor (_port, yn);
+#else
+		jack_port_request_monitor(_port, yn);
+#endif
+
 	}
 
 	/*XXX completely bloody useless imho*/