Merged gr-msdd6000 portability fix to trunk (eb/msdd -r8940:9027)

[debian/gnuradio] / config / grc_gcell.m4

diff --git a/config/grc_gcell.m4 b/config/grc_gcell.m4
index 6d7144131e86ddab3573b1bd541e218b90009b36..38854b95b497f9ec4039feba33451dbd713ba7d2 100644 (file)
--- a/config/grc_gcell.m4
+++ b/config/grc_gcell.m4
@@ -21,10 +21,8 @@ AC_DEFUN([GRC_GCELL],[
     GRC_ENABLE(gcell)
     dnl GRC_WITH(gcell)
 
-    dnl Don't do gcell if omnithread or mblock skipped
-    dnl (The mblock dependency should be refactored, we're just using some timing utilities)
+    dnl Don't do gcell if omnithread skipped
     GRC_CHECK_DEPENDENCY(gcell, omnithread)
-    GRC_CHECK_DEPENDENCY(gcell, mblock)
 
     dnl If execution gets to here, $passed will be:
     dnl   with : if the --with code didn't error out
@@ -55,16 +53,21 @@ AC_DEFUN([GRC_GCELL],[
        gcell_INCLUDES="-I\${abs_top_srcdir}/gcell/src/include \
                 -I\${abs_top_srcdir}/gcell/src/lib/runtime \
                 -I\${abs_top_srcdir}/gcell/src/lib/general \
-                -I\${abs_top_srcdir}/gcell/src/lib/procs"
+                -I\${abs_top_srcdir}/gcell/src/lib/wrapper"
         gcell_LA="\${abs_top_builddir}/gcell/src/lib/libgcell.la"
        gcell_spu_INCLUDES="-I\${abs_top_srcdir}/gcell/src/include/spu \
                 -I\${abs_top_srcdir}/gcell/src/include \
                 -I\${abs_top_srcdir}/gcell/src/lib/runtime/spu \
                 -I\${abs_top_srcdir}/gcell/src/lib/general/spu \
-                -I\${abs_top_srcdir}/gcell/src/lib/procs/spu"
+                -I\${abs_top_srcdir}/gcell/src/lib/wrapper/spu"
        gcell_spu_LA="\${abs_top_builddir}/gcell/src/lib/spu/libgcell_spu.a"
        AC_SUBST(gcell_spu_INCLUDES)
        AC_SUBST(gcell_spu_LA)
+
+        dnl kludge up initial swig dependency files
+        AC_CONFIG_COMMANDS([swig_gcell_deps], [
+            touch gr-gcell/src/gcell.d
+        ])
     fi
 
     AC_CONFIG_FILES([ \
@@ -76,7 +79,7 @@ AC_DEFUN([GRC_GCELL],[
         gcell/src/lib/Makefile \
         gcell/src/lib/spu/Makefile \
         gcell/src/lib/general/Makefile \
-        gcell/src/lib/procs/Makefile \
+        gcell/src/lib/wrapper/Makefile \
         gcell/src/lib/runtime/Makefile \
         gcell/src/apps/Makefile \
        gcell/src/apps/spu/Makefile \