X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=config%2Fgrc_gr_comedi.m4;h=5e30894174b46c697e416dec7c2ae2b1d8e8ab66;hb=HEAD;hp=7d6a674e35b40b3f0e2451336258d4f7d3d2adb3;hpb=937b719d2e57d0497293d603da10cac2532346f6;p=debian%2Fgnuradio

diff --git a/config/grc_gr_comedi.m4 b/config/grc_gr_comedi.m4
index 7d6a674e..5e308941 100644
--- a/config/grc_gr_comedi.m4
+++ b/config/grc_gr_comedi.m4
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
 dnl 
 dnl This file is part of GNU Radio
 dnl 
@@ -18,20 +18,29 @@ dnl the Free Software Foundation, Inc., 51 Franklin Street,
 dnl Boston, MA 02110-1301, USA.
 
 AC_DEFUN([GRC_GR_COMEDI],[
-    GRC_ENABLE([gr-comedi])
+    GRC_ENABLE(gr-comedi)
+
+    dnl Don't do gr-comedi if gnuradio-core skipped
+    GRC_CHECK_DEPENDENCY(gr-comedi, gnuradio-core)
+
+    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 Don't do gr-comedi if the 'comedi' library is unavailable.
+        PKG_CHECK_MODULES(COMEDI, comedilib < 0.8,[],
+            [passed=no;AC_MSG_RESULT([gr-comedi requires comedilib, not found.])])
+    fi
 
     AC_CONFIG_FILES([ \
-	gr-comedi/Makefile \
-	gr-comedi/src/Makefile \
-	gr-comedi/src/run_tests \
+        gr-comedi/Makefile \
+	gr-comedi/gnuradio-comedi.pc \
+        gr-comedi/src/Makefile \
+        gr-comedi/src/run_tests \
     ])
 
-    passed=yes
-    PKG_CHECK_MODULES(COMEDI, comedilib >= 0.7,[],
-        [passed=no;AC_MSG_RESULT([gr-comedi requires comedilib, not found.])])
-
-    GRC_BUILD_CONDITIONAL([gr-comedi],[
-	AC_SUBST(COMEDI_LIBS)
+    GRC_BUILD_CONDITIONAL(gr-comedi,[
 	dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_comedi], [chmod +x gr-comedi/src/run_tests])
     ])