fix to restart libusbok checking for non-PKGCONFIG

[debian/gnuradio] / config / grc_gcell.m4

diff --git a/config/grc_gcell.m4 b/config/grc_gcell.m4
index 6d7144131e86ddab3573b1bd541e218b90009b36..ff289d1aeccfc14b400cd2527824053e58846ae5 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
@@ -52,35 +50,30 @@ AC_DEFUN([GRC_GCELL],[
 
     if test $passed != with; then
        dnl how and where to find INCLUDES and LA
-       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"
-        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"
-       gcell_spu_LA="\${abs_top_builddir}/gcell/src/lib/spu/libgcell_spu.a"
+       gcell_INCLUDES="-I\${abs_top_srcdir}/gcell/include"
+        gcell_LA="\${abs_top_builddir}/gcell/lib/libgcell.la"
+       gcell_spu_INCLUDES="-I\${abs_top_srcdir}/gcell/include"
+       gcell_spu_LA="\${abs_top_builddir}/gcell/lib/spu/libgcell_spu.a"
        AC_SUBST(gcell_spu_INCLUDES)
        AC_SUBST(gcell_spu_LA)
+
     fi
 
     AC_CONFIG_FILES([ \
         gcell/Makefile \
         gcell/gcell.pc \
-        gcell/src/Makefile \
-        gcell/src/include/Makefile \
-        gcell/src/include/spu/Makefile \
-        gcell/src/lib/Makefile \
-        gcell/src/lib/spu/Makefile \
-        gcell/src/lib/general/Makefile \
-        gcell/src/lib/procs/Makefile \
-        gcell/src/lib/runtime/Makefile \
-        gcell/src/apps/Makefile \
-       gcell/src/apps/spu/Makefile \
-       gcell/src/ibm/Makefile \
+        gcell/gcell_spu.pc \
+       gcell/include/Makefile \
+        gcell/include/gcell/Makefile \
+        gcell/include/gcell/spu/Makefile \
+        gcell/lib/Makefile \
+        gcell/lib/spu/Makefile \
+        gcell/lib/general/Makefile \
+        gcell/lib/wrapper/Makefile \
+        gcell/lib/runtime/Makefile \
+        gcell/apps/Makefile \
+       gcell/apps/spu/Makefile \
+       gcell/ibm/Makefile \
     ])
 
     GRC_BUILD_CONDITIONAL(gcell)