[Commit-gnuradio] r8517 - in gnuradio/branches/developers/eb/mp-sched: config gnuradio-core/src/lib

[eb]

Author: eb
Date: 2008-05-28 10:53:43 -0600 (Wed, 28 May 2008)
New Revision: 8517

Modified:
   gnuradio/branches/developers/eb/mp-sched/config/grc_gnuradio_core.m4
   gnuradio/branches/developers/eb/mp-sched/gnuradio-core/src/lib/Makefile.am
Log:
Added dependency on thread building blocks.  We eventually may want this be 
optional.



Modified: gnuradio/branches/developers/eb/mp-sched/config/grc_gnuradio_core.m4
===================================================================
--- gnuradio/branches/developers/eb/mp-sched/config/grc_gnuradio_core.m4        
2008-05-28 16:41:42 UTC (rev 8516)
+++ gnuradio/branches/developers/eb/mp-sched/config/grc_gnuradio_core.m4        
2008-05-28 16:53:43 UTC (rev 8517)
@@ -31,6 +31,10 @@
     dnl Don't do gnuradio-core if omnithread skipped
     GRC_CHECK_DEPENDENCY(gnuradio-core, omnithread)
 
+    dnl check for intel threading building blocks
+    PKG_CHECK_MODULES(TBB, tbb >= 2.0, [],
+       [passed=no; AC_MSG_RESULT([gnuradio-core requires threading building 
blocks. See http://www.threadingbuildingblocks.org])])
+
     dnl If execution gets to here, $passed will be:
     dnl   with : if the --with code didn't error out
     dnl   yes  : if the --enable code passed muster and all dependencies are 
met
@@ -51,7 +55,7 @@
 -I\${abs_top_srcdir}/gnuradio-core/src/lib/g72x \
 -I\${abs_top_srcdir}/gnuradio-core/src/lib/swig \
 -I\${abs_top_builddir}/gnuradio-core/src/lib/swig \
-\$(FFTW3F_CFLAGS)"
+\$(FFTW3F_CFLAGS) \$(TBB_CFLAGS)"
         
gnuradio_core_LA="\${abs_top_builddir}/gnuradio-core/src/lib/libgnuradio-core.la"
        
gnuradio_core_I="\${abs_top_srcdir}/gnuradio-core/src/lib/swig/gnuradio.i"
        
gnuradio_core_LIBDIRPATH="\${abs_top_builddir}/gnuradio-core/src/lib:\${abs_top_builddir}/gnuradio-core/src/lib/.libs"

Modified: 
gnuradio/branches/developers/eb/mp-sched/gnuradio-core/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/mp-sched/gnuradio-core/src/lib/Makefile.am  
2008-05-28 16:41:42 UTC (rev 8516)
+++ gnuradio/branches/developers/eb/mp-sched/gnuradio-core/src/lib/Makefile.am  
2008-05-28 16:53:43 UTC (rev 8517)
@@ -47,7 +47,8 @@
        reed-solomon/librs.la           \
        runtime/libruntime.la           \
        $(OMNITHREAD_LA)                \
-       $(FFTW3F_LIBS)
+       $(FFTW3F_LIBS)                  \
+       $(TBB_LIBS)
 
 libgnuradio_core_qa_la_LIBADD  =       \
        filter/libfilter-qa.la          \