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

diff --git a/config/grc_gruel.m4 b/config/grc_gruel.m4
index 0ef2bac2cdad6b0bdbc4a4e8d6301257b247a1ea..365edbde05a6119dfc6522e3216cef562946ddbd 100644 (file)
--- 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 8f467fd2eb6e8370d06b97d9ede7afb1fcd876a9..69fbe26dc0758c12fc39a7af13c4d797d2ec86df 100644 (file)
--- 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