[Commit-gnuradio] r3395 - in gnuradio/branches/developers/jcorgan/ticket-28: . config

[jcorgan]

Author: jcorgan
Date: 2006-08-23 23:01:50 -0600 (Wed, 23 Aug 2006)
New Revision: 3395

Modified:
   gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_comedi.m4
   gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
Log:
Implements ticket:28 for gr-comedi.

Modified: gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_comedi.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_comedi.m4      
2006-08-24 04:55:28 UTC (rev 3394)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_comedi.m4      
2006-08-24 05:01:50 UTC (rev 3395)
@@ -18,7 +18,7 @@
 dnl Boston, MA 02111-1307, USA.
 
 AC_DEFUN([GRC_GR_COMEDI],[
-    AC_CONFIG_SRCDIR([gr-comedi/src/comedi.i])
+    GRC_ENABLE([gr-comedi])
 
     AC_CONFIG_FILES([ \
        gr-comedi/Makefile \
@@ -26,16 +26,13 @@
        gr-comedi/src/run_tests \
     ])
 
-    succeeded=yes
-    PKG_CHECK_MODULES(COMEDI, comedilib >= 0.7,[],[succeeded=no])
-    if test $succeeded = yes; then
-       AC_SUBST(COMEDI_LIBS)
+    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)
        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])
-        subdirs="$subdirs gr-comedi"
-    else
-       AC_MSG_WARN([$COMEDI_PKG_ERRORS])
-       failed="$failed gr-comedi"
-    fi
+    ])
 ])

Modified: gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-24 
04:55:28 UTC (rev 3394)
+++ gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-24 
05:01:50 UTC (rev 3395)
@@ -167,7 +167,7 @@
 GRC_GR_AUDIO_PORTAUDIO
 GRC_GR_AUDIO_WINDOWS
 GRC_GR_ATSC
-#GRC_GR_COMEDI
+GRC_GR_COMEDI
 #dnl GRC_GR_ERROR_CORRECTING_CODES  dnl disabled until fix for ticket:36
 #GRC_GR_GSM_FR_VOCODER
 #GRC_GR_RADAR