[Commit-gnuradio] r9407 - in gnuradio/trunk: . config

[eb]

Author: eb
Date: 2008-08-25 12:59:46 -0600 (Mon, 25 Aug 2008)
New Revision: 9407

Modified:
   gnuradio/trunk/config/grc_gruel.m4
   gnuradio/trunk/run_tests.sh.in
Log:
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.


Modified: gnuradio/trunk/config/grc_gruel.m4
===================================================================
--- gnuradio/trunk/config/grc_gruel.m4  2008-08-25 18:16:41 UTC (rev 9406)
+++ gnuradio/trunk/config/grc_gruel.m4  2008-08-25 18:59:46 UTC (rev 9407)
@@ -26,9 +26,10 @@
     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([\

Modified: gnuradio/trunk/run_tests.sh.in
===================================================================
--- gnuradio/trunk/run_tests.sh.in      2008-08-25 18:16:41 UTC (rev 9406)
+++ gnuradio/trunk/run_tests.sh.in      2008-08-25 18:59:46 UTC (rev 9407)
@@ -59,13 +59,16 @@
 # Where to find omnithread library files
 address@hidden@
 
+# Where to find gruel library files
address@hidden@
+
 # Where to find gnuradio core's library files
 address@hidden@
 
 # 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