diff options
-rw-r--r-- | config/grc_usrp.m4 | 6 | ||||
-rw-r--r-- | gr-atsc/src/python/run_tests.in | 4 | ||||
-rw-r--r-- | gr-audio-osx/src/mld_threads.h | 2 | ||||
-rw-r--r-- | gr-audio-osx/src/run_tests.in | 4 | ||||
-rw-r--r-- | gr-gsm-fr-vocoder/src/python/run_tests.in | 4 | ||||
-rw-r--r-- | gr-radio-astronomy/src/python/run_tests.in | 4 | ||||
-rw-r--r-- | gr-trellis/src/python/run_tests.in | 4 | ||||
-rw-r--r-- | 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 0883e3951..88290f7ab 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 a13c393ae..36d0c07a2 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 12adc23ee..5885c38e9 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 bc756b13c..7f755f00f 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 a06faeb6d..9c39d1d40 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 e78f4329c..a6a726b9a 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 30a40a573..89df2dd6d 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 4a67ab517..0a582601d 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. |