fix scons tests for various JACK functions; use jack_on_info_shutdown() if its available at compile time

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

1 files changed, 6 insertions, 6 deletions

diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index 60edcdeefe..a965d235b9 100644
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -143,7 +143,7 @@ ardour.Merge ([ libraries['jack'] ])
 # See if JACK supports jack_client_open()
 #
 
-jack_test_source_file = """
+jack_client_open_source_file = """
 #include <jack/jack.h>
 int main(int argc, char **argv)
 {
@@ -153,7 +153,7 @@ int main(int argc, char **argv)
 """
 def CheckJackClientOpen(context):
         context.Message('Checking for jack_client_open()...')
-        result = context.TryLink(jack_test_source_file, '.c')
+        result = context.TryLink(jack_client_open_source_file, '.c')
         context.Result(result)
         return result
 
@@ -161,7 +161,7 @@ def CheckJackClientOpen(context):
 # See if JACK supports jack_on_info_shutdown()
 #
 
-jack_test_source_file = """
+jack_on_info_shutdown_source_file = """
 #include <jack/jack.h>
 void callback (int code, const char* reason, void* arg) { return; }
 int main(int argc, char **argv)
@@ -173,7 +173,7 @@ int main(int argc, char **argv)
 """
 def CheckJackOnInfoShutdown(context):
         context.Message('Checking for jack_on_info_shutdown()...')
-        result = context.TryLink(jack_test_source_file, '.c')
+        result = context.TryLink(jack_on_info_shutdown_source_file, '.c')
         context.Result(result)
         return result
 
@@ -181,7 +181,7 @@ def CheckJackOnInfoShutdown(context):
 # See if JACK supports jack_recompute_total_latencies()
 #
 
-jack_test_source_file = """
+jack_recompute_latencies_source_file = """
 #include <jack/jack.h>
 int main(int argc, char **argv)
 {
@@ -191,7 +191,7 @@ int main(int argc, char **argv)
 """
 def CheckJackRecomputeLatencies(context):
         context.Message('Checking for jack_recompute_total_latencies()...')
-        result = context.TryLink(jack_test_source_file, '.c')
+        result = context.TryLink(jack_recompute_latencies_source_file, '.c')
         context.Result(result)
         return result