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

[jcorgan]

Author: jcorgan
Date: 2006-08-23 22:42:32 -0600 (Wed, 23 Aug 2006)
New Revision: 3392

Modified:
   
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_portaudio.m4
   gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
Log:
Implemented ticket:28 for gr-audio-portaudio.

Modified: 
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_portaudio.m4
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_portaudio.m4 
    2006-08-24 04:35:41 UTC (rev 3391)
+++ 
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_portaudio.m4 
    2006-08-24 04:42:32 UTC (rev 3392)
@@ -18,7 +18,7 @@
 dnl Boston, MA 02111-1307, USA.
 
 AC_DEFUN([GRC_GR_AUDIO_PORTAUDIO],[
-    AC_CONFIG_SRCDIR([gr-audio-portaudio/src/audio_portaudio.i])
+    GRC_ENABLE([gr-audio-portaudio])
 
     AC_CONFIG_FILES([ \
        gr-audio-portaudio/Makefile \
@@ -26,16 +26,13 @@
        gr-audio-portaudio/src/run_tests \
     ])
 
-    succeeded=yes
-    PKG_CHECK_MODULES(PORTAUDIO, portaudio-2.0 >= 19,[],[succeeded=no])
+    passed=yes
+    PKG_CHECK_MODULES(PORTAUDIO, portaudio-2.0 >= 19,[],
+        [passed=no;AC_MSG_RESULT([gr-audio-portaudio requires package 
portaudio, not found.])])
 
-    if test $succeeded = yes; then
+    GRC_BUILD_CONDITIONAL([gr-audio-portaudio],[
        AC_SUBST(PORTAUDIO_LIBS)
        dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_portaudio], [chmod +x 
gr-audio-portaudio/src/run_tests])
-        subdirs="$subdirs gr-audio-portaudio"
-    else
-       AC_MSG_RESULT([failed: $PORTAUDIO_PKG_ERRORS])
-       failed="$failed gr-audio-portaudio"
-    fi
+    ])
 ])

Modified: gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-24 
04:35:41 UTC (rev 3391)
+++ gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-24 
04:42:32 UTC (rev 3392)
@@ -164,7 +164,7 @@
 GRC_GR_AUDIO_JACK
 GRC_GR_AUDIO_OSS
 GRC_GR_AUDIO_OSX
-#GRC_GR_AUDIO_PORTAUDIO                dnl ***NOT TESTED***
+GRC_GR_AUDIO_PORTAUDIO         dnl ***NOT TESTED***
 #GRC_GR_AUDIO_WINDOWS          dnl ***NOT TESTED***
 #GRC_GR_ATSC
 #GRC_GR_COMEDI