X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=config%2Fgrc_gnuradio_core.m4;h=269634324ffe002f100dfdb05e73fec63ac15da1;hb=refs%2Fheads%2Fupstream;hp=24432a28fc7bdb339a3a0c7d980e5156c1976fa8;hpb=a52f9a19581901beabc9111917965b9817231014;p=debian%2Fgnuradio

diff --git a/config/grc_gnuradio_core.m4 b/config/grc_gnuradio_core.m4
index 24432a28..26963432 100644
--- a/config/grc_gnuradio_core.m4
+++ b/config/grc_gnuradio_core.m4
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc.
 dnl 
 dnl This file is part of GNU Radio
 dnl 
@@ -28,13 +28,22 @@ AC_DEFUN([GRC_GNURADIO_CORE],[
 	gnuradio_core_PYDIRPATH=$pythondir
     ])
 
-    dnl Don't do gnuradio-core if omnithread skipped
-    GRC_CHECK_DEPENDENCY(gnuradio-core, omnithread)
+    dnl Don't do gnuradio-core if gruel skipped
+    GRC_CHECK_DEPENDENCY(gnuradio-core, gruel)
 
     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
     dnl   no   : otherwise
+    if test $passed = yes; then	
+	dnl look for fast CBLAS for GSL, but don't complain if not found
+	ACX_CBLAS([],[])
+        dnl check for GSL
+	PKG_CHECK_MODULES(GSL, gsl >= 1.10,
+	    [], dnl FIXME remove -lgslcblas from GSL_LIBS if we found a better CBLAS_LIBS above
+	    [passed=no;AC_MSG_RESULT([gnuradio-core requires package gsl >= 1.10, not found.])])
+    fi
+
     if test $passed != with; then
 	dnl how and where to find INCLUDES and LA and such
         gnuradio_core_INCLUDES="\
@@ -45,27 +54,21 @@ AC_DEFUN([GRC_GNURADIO_CORE],[
 -I\${abs_top_builddir}/gnuradio-core/src/lib/gengen \
 -I\${abs_top_srcdir}/gnuradio-core/src/lib/filter \
 -I\${abs_top_builddir}/gnuradio-core/src/lib/filter \
+-I\${abs_top_srcdir}/gnuradio-core/src/lib/missing \
 -I\${abs_top_srcdir}/gnuradio-core/src/lib/reed-solomon \
 -I\${abs_top_srcdir}/gnuradio-core/src/lib/viterbi \
 -I\${abs_top_srcdir}/gnuradio-core/src/lib/io \
 -I\${abs_top_srcdir}/gnuradio-core/src/lib/g72x \
 -I\${abs_top_srcdir}/gnuradio-core/src/lib/swig \
+-I\${abs_top_srcdir}/gnuradio-core/src/lib/hier \
 -I\${abs_top_builddir}/gnuradio-core/src/lib/swig \
-\$(FFTW3F_CFLAGS)"
+\$(FFTW3F_CFLAGS) \
+\$(GSL_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"
+	dnl 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"
 	gnuradio_core_SWIGDIRPATH="\${abs_top_builddir}/gnuradio-core/src/lib/swig:\${abs_top_builddir}/gnuradio-core/src/lib/swig/.libs:\${abs_top_srcdir}/gnuradio-core/src/lib/swig"
 	gnuradio_core_PYDIRPATH="\${abs_top_srcdir}/gnuradio-core/src/python"
-
-        dnl kludge up initial swig dependency files
-        AC_CONFIG_COMMANDS([swig_deps], [
-            touch gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.d
-            touch gnuradio-core/src/lib/swig/gnuradio_swig_py_general.d
-            touch gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.d
-            touch gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.d
-            touch gnuradio-core/src/lib/swig/gnuradio_swig_py_io.d
-        ])
     fi
 
     dnl other externally-required gnuradio-core variables
@@ -76,23 +79,20 @@ AC_DEFUN([GRC_GNURADIO_CORE],[
     AC_CONFIG_FILES([ \
         gnuradio-core/Makefile
         gnuradio-core/gnuradio-core.pc \
-        gnuradio-core/doc/Doxyfile \
-        gnuradio-core/doc/Makefile \
-        gnuradio-core/doc/other/Makefile \
-        gnuradio-core/doc/xml/Makefile \
         gnuradio-core/src/Makefile \
         gnuradio-core/src/gen_interpolator_taps/Makefile \
         gnuradio-core/src/lib/Makefile \
         gnuradio-core/src/lib/filter/Makefile \
         gnuradio-core/src/lib/g72x/Makefile \
         gnuradio-core/src/lib/general/Makefile \
-        gnuradio-core/src/lib/general/gr_prefix.cc \
+        gnuradio-core/src/lib/general/gr_constants.cc \
         gnuradio-core/src/lib/gengen/Makefile \
         gnuradio-core/src/lib/io/Makefile \
         gnuradio-core/src/lib/missing/Makefile \
         gnuradio-core/src/lib/reed-solomon/Makefile \
         gnuradio-core/src/lib/viterbi/Makefile \
         gnuradio-core/src/lib/runtime/Makefile \
+	gnuradio-core/src/lib/hier/Makefile \
         gnuradio-core/src/lib/swig/Makefile \
         gnuradio-core/src/python/Makefile \
         gnuradio-core/src/python/bin/Makefile \