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

diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4
index 0883e395193466d883f880b3aca615d305819f70..88290f7ab16b7b0615dd0145ffb82613208c83d8 100644 (file)
--- 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 a13c393aed3a33dc72aebbdc82048e9fd38dc8fb..36d0c07a2f0320d22f6a5ac28aca670df4cb68e3 100644 (file)
--- 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 12adc23eeb86b874b3bb0891144d10f8ff424347..5885c38e9df9aead2ef0a02d7ecc5f0d9c91b754 100644 (file)
--- 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 bc756b13c27740bba9dcee898c04541e37dd6406..7f755f00f07e14cbb4cf012058330a0b4103f44d 100644 (file)
--- 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 a06faeb6d31459d68aeda0ca5ad97c34d0a70d37..9c39d1d40a95b150f3473c00970dc7ba34cc5e8c 100644 (file)
--- 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 e78f4329c3298090ab40dd7fd120e388a2d160ee..a6a726b9ae70f0c6880f1517bb5691a1a4ff15d4 100644 (file)
--- 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 30a40a573d7bff54bfc2123437b49a18c1468f09..89df2dd6dda01408902635dc71de2246a827d2c1 100644 (file)
--- 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 4a67ab51782bc2b42753d49c4e4ce045c92180d8..0a582601dde3fec22d8fc8292bd9dad26b005808 100644 (file)
--- 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.