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

[jcorgan]

Author: jcorgan
Date: 2006-08-23 21:27:59 -0600 (Wed, 23 Aug 2006)
New Revision: 3389

Modified:
   gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_jack.m4
   gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
Log:
Implements ticket:28 for gr-audio-jack.

Modified: 
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_jack.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_jack.m4  
2006-08-24 03:16:33 UTC (rev 3388)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_jack.m4  
2006-08-24 03:27:59 UTC (rev 3389)
@@ -18,7 +18,7 @@
 dnl Boston, MA 02111-1307, USA.
 
 AC_DEFUN([GRC_GR_AUDIO_JACK],[
-    AC_CONFIG_SRCDIR([gr-audio-jack/src/audio_jack.i])
+    GRC_ENABLE([gr-audio-jack])
 
     AC_CONFIG_FILES([ \
        gr-audio-jack/Makefile \
@@ -26,16 +26,12 @@
        gr-audio-jack/src/run_tests \
     ])
 
-    succeeded=yes
-    PKG_CHECK_MODULES(JACK, jack >= 0.8,[],[succeeded=no])
-    if test $succeeded = yes; then
-       AC_SUBST(JACK_LIBS)
+    PKG_CHECK_MODULES(JACK, jack >= 0.8,[],
+        [passed=no;AC_MSG_RESULT([gr-audio-jack requires package jack, not 
found.])])
 
+    GRC_BUILD_CONDITIONAL([gr-audio-jack],[
+       AC_SUBST(JACK_LIBS)
        dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_jack], [chmod +x 
gr-audio-jack/src/run_tests])
-        subdirs="$subdirs gr-audio-jack"
-    else
-       AC_MSG_RESULT([failed: $JACK_PKG_ERRORS])
-       failed="$failed gr-audio-jack"
-    fi
+    ])
 ])

Modified: gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-24 
03:16:33 UTC (rev 3388)
+++ gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-24 
03:27:59 UTC (rev 3389)
@@ -161,7 +161,7 @@
 GRC_USRP
 GRC_GR_USRP                    dnl this must come after GRC_USRP
 GRC_GR_AUDIO_ALSA
-#GRC_GR_AUDIO_JACK
+GRC_GR_AUDIO_JACK
 #GRC_GR_AUDIO_OSS
 #GRC_GR_AUDIO_OSX
 #GRC_GR_AUDIO_PORTAUDIO                dnl ***NOT TESTED***