diff options
| author | eb | 2008-08-25 18:59:46 +0000 |
|---|---|---|
| committer | eb | 2008-08-25 18:59:46 +0000 |
| commit | 4f2edd5d1a76fc0a4ab0f4f03db981c0fb97ca1a (patch) | |
| tree | ad8f6f8cb8a30f14865260ae483282dd8592f3e0 | |
| parent | 17073112f9665863861e5ac681f05d11c7f30b50 (diff) | |
| download | gnuradio-4f2edd5d1a76fc0a4ab0f4f03db981c0fb97ca1a.tar.gz gnuradio-4f2edd5d1a76fc0a4ab0f4f03db981c0fb97ca1a.tar.bz2 gnuradio-4f2edd5d1a76fc0a4ab0f4f03db981c0fb97ca1a.zip | |
make check fix for OS/X. Probably also fixes ticket:264, same problem
on MingGW and Cygwin. Thanks to Michael Dickens. Merged
michaelld/gruel_make_check_osx 9401:9402 to trunk.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9407 221aa14e-8319-0410-a670-987f0aec2ac5
| -rw-r--r-- | config/grc_gruel.m4 | 3 | ||||
| -rw-r--r-- | run_tests.sh.in | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/config/grc_gruel.m4 b/config/grc_gruel.m4 index 0ef2bac2c..365edbde0 100644 --- a/config/grc_gruel.m4 +++ b/config/grc_gruel.m4 @@ -26,9 +26,10 @@ AC_DEFUN([GRC_GRUEL],[ dnl yes : if the --enable code passed muster and all dependencies are met dnl no : otherwise if test $passed != with; then - dnl how and where to find INCLUDES and LA + dnl how and where to find INCLUDES and LA and such gruel_INCLUDES="-I\${abs_top_srcdir}/gruel/src/include" gruel_LA="\${abs_top_builddir}/gruel/src/lib/libgruel.la" + gruel_LIBDIRPATH="\${abs_top_builddir}/gruel/src/lib:\${abs_top_builddir}/gruel/src/lib/.libs" fi AC_CONFIG_FILES([\ diff --git a/run_tests.sh.in b/run_tests.sh.in index 8f467fd2e..69fbe26dc 100644 --- a/run_tests.sh.in +++ b/run_tests.sh.in @@ -59,13 +59,16 @@ export PYTHONPATH # Where to find omnithread library files gromnidir=@omnithread_LIBDIRPATH@ +# Where to find gruel library files +grueldir=@gruel_LIBDIRPATH@ + # Where to find gnuradio core's library files grcoredir=@gnuradio_core_LIBDIRPATH@ # Construct search path for python modules # Check each one to make sure it's not "" before adding grlibdir="" -for dir in $gromnidir $grcoredir +for dir in $gromnidir $grcoredir $grueldir do if [ "$dir" != "" ] then |