From 0b9b3564fd50c630fbbce7a06fda134ae5468828 Mon Sep 17 00:00:00 2001
From: jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Sat, 12 Aug 2006 19:25:38 +0000
Subject: [PATCH] Fixes ticket:26, ticket:27, and ticket:32. Merged -r3250:3255
 from jcorgan/ticket-26.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3259 221aa14e-8319-0410-a670-987f0aec2ac5
---
 config/grc_usrp.m4                         | 6 +++---
 gr-atsc/src/python/run_tests.in            | 4 ++++
 gr-audio-osx/src/mld_threads.h             | 2 +-
 gr-audio-osx/src/run_tests.in              | 4 ++++
 gr-gsm-fr-vocoder/src/python/run_tests.in  | 4 ++++
 gr-radio-astronomy/src/python/run_tests.in | 4 ++++
 gr-trellis/src/python/run_tests.in         | 4 ++++
 gr-usrp/src/run_tests.in                   | 4 ++++
 8 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4
index 0883e395..88290f7a 100644
--- a/config/grc_usrp.m4
+++ b/config/grc_usrp.m4
@@ -59,11 +59,11 @@ AC_DEFUN([GRC_USRP],[
     dnl check for SDCC 2.4.0
     USRP_SDCC([2.4.0],[],[succeeded=no])
     
-    AC_CHECK_FUNCS([getrusage sched_setscheduler],[],[succeeded=no])
-    AC_CHECK_FUNCS([sigaction snprintf],[],[succeeded=no])
+    AC_CHECK_FUNCS([getrusage sched_setscheduler])
+    AC_CHECK_FUNCS([sigaction snprintf])
 
     dnl we use these to handle possible byteswapping to and from the USRP.
-    AC_CHECK_HEADERS([byteswap.h],[],[succeeeded=no])
+    AC_CHECK_HEADERS([byteswap.h])
     AC_C_BIGENDIAN
 
     if test $succeeded = yes; then
diff --git a/gr-atsc/src/python/run_tests.in b/gr-atsc/src/python/run_tests.in
index a13c393a..36d0c07a 100644
--- a/gr-atsc/src/python/run_tests.in
+++ b/gr-atsc/src/python/run_tests.in
@@ -25,6 +25,10 @@ grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
 PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
 export PYTHONPATH
 
+# For OS/X
+DYLD_LIBRARY_PATH="@abs_top_builddir@/gnuradio-core/src/lib/.libs"
+export DYLD_LIBRARY_PATH
+
 #
 # This is the simple part...
 # Run everything that matches qa_*.py and return the final result.
diff --git a/gr-audio-osx/src/mld_threads.h b/gr-audio-osx/src/mld_threads.h
index 12adc23e..5885c38e 100644
--- a/gr-audio-osx/src/mld_threads.h
+++ b/gr-audio-osx/src/mld_threads.h
@@ -26,7 +26,7 @@
 /* classes which allow for either pthreads or omni_threads */
 
 #ifdef _USE_OMNI_THREADS_
-#include <gnuradio/omnithread.h>
+#include <omnithread.h>
 #else
 #include <pthread.h>
 #endif
diff --git a/gr-audio-osx/src/run_tests.in b/gr-audio-osx/src/run_tests.in
index bc756b13..7f755f00 100644
--- a/gr-audio-osx/src/run_tests.in
+++ b/gr-audio-osx/src/run_tests.in
@@ -27,6 +27,10 @@ grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
 PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
 export PYTHONPATH
 
+# For OS/X
+DYLD_LIBRARY_PATH="@abs_top_builddir@/gnuradio-core/src/lib/.libs"
+export DYLD_LIBRARY_PATH
+
 #
 # This is the simple part...
 # Run everything that matches qa_*.py and return the final result.
diff --git a/gr-gsm-fr-vocoder/src/python/run_tests.in b/gr-gsm-fr-vocoder/src/python/run_tests.in
index a06faeb6..9c39d1d4 100644
--- a/gr-gsm-fr-vocoder/src/python/run_tests.in
+++ b/gr-gsm-fr-vocoder/src/python/run_tests.in
@@ -25,6 +25,10 @@ grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
 PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
 export PYTHONPATH
 
+# For OS/X
+DYLD_LIBRARY_PATH="@abs_top_builddir@/gnuradio-core/src/lib/.libs"
+export DYLD_LIBRARY_PATH
+
 #
 # This is the simple part...
 # Run everything that matches qa_*.py and return the final result.
diff --git a/gr-radio-astronomy/src/python/run_tests.in b/gr-radio-astronomy/src/python/run_tests.in
index e78f4329..a6a726b9 100644
--- a/gr-radio-astronomy/src/python/run_tests.in
+++ b/gr-radio-astronomy/src/python/run_tests.in
@@ -25,6 +25,10 @@ grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
 PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
 export PYTHONPATH
 
+# For OS/X
+DYLD_LIBRARY_PATH="@abs_top_builddir@/gnuradio-core/src/lib/.libs"
+export DYLD_LIBRARY_PATH
+
 #
 # This is the simple part...
 # Run everything that matches qa_*.py and return the final result.
diff --git a/gr-trellis/src/python/run_tests.in b/gr-trellis/src/python/run_tests.in
index 30a40a57..89df2dd6 100644
--- a/gr-trellis/src/python/run_tests.in
+++ b/gr-trellis/src/python/run_tests.in
@@ -25,6 +25,10 @@ grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
 PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
 export PYTHONPATH
 
+# For OS/X
+DYLD_LIBRARY_PATH="@abs_top_builddir@/gnuradio-core/src/lib/.libs"
+export DYLD_LIBRARY_PATH
+
 #
 # This is the simple part...
 # Run everything that matches qa_*.py and return the final result.
diff --git a/gr-usrp/src/run_tests.in b/gr-usrp/src/run_tests.in
index 4a67ab51..0a582601 100644
--- a/gr-usrp/src/run_tests.in
+++ b/gr-usrp/src/run_tests.in
@@ -28,6 +28,10 @@ usrpbld=@abs_top_builddir@/usrp/host/lib
 PYTHONPATH="$grbld:$libbld:$libbld/.libs:$libsrc:$py:$usrpbld:$PYTHONPATH"
 export PYTHONPATH
 
+# For OS/X
+DYLD_LIBRARY_PATH=@abs_top_builddir@/gnuradio-core/src/lib/.libs:@abs_top_builddir@/usrp/host/lib/.libs
+export DYLD_LIBRARY_PATH
+
 #
 # This is the simple part...
 # Run everything that matches qa_*.py and return the final result.
-- 
2.30.2