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

[jcorgan]

Author: jcorgan
Date: 2006-08-23 21:16:33 -0600 (Wed, 23 Aug 2006)
New Revision: 3388

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

Modified: gnuradio/branches/developers/jcorgan/ticket-28/config/grc_build.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/config/grc_build.m4  
2006-08-24 03:03:46 UTC (rev 3387)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/grc_build.m4  
2006-08-24 03:16:33 UTC (rev 3388)
@@ -41,6 +41,7 @@
         if test x$enable_$1 != xno; then
            $2
            build_dirs="$build_dirs $1"
+           AC_MSG_RESULT([Component $1 passed configuration checks.])
        fi
     fi
 ])

Modified: 
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_alsa.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_alsa.m4  
2006-08-24 03:03:46 UTC (rev 3387)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_audio_alsa.m4  
2006-08-24 03:16:33 UTC (rev 3388)
@@ -18,7 +18,7 @@
 dnl Boston, MA 02111-1307, USA.
 
 AC_DEFUN([GRC_GR_AUDIO_ALSA],[
-    AC_CONFIG_SRCDIR([gr-audio-alsa/src/audio_alsa.i])
+    GRC_ENABLE([gr-audio-alsa])
 
     AC_CONFIG_FILES([ \
        gr-audio-alsa/Makefile \
@@ -26,16 +26,12 @@
        gr-audio-alsa/src/run_tests \
     ])
 
-    succeeded=yes
-    PKG_CHECK_MODULES(ALSA, alsa >= 0.9,[],[succeeded=no])
-    if test $succeeded = yes; then
-       AC_SUBST(ALSA_LIBS)
+    PKG_CHECK_MODULES(ALSA, alsa >= 0.9,[],
+        [passed=no;AC_MSG_RESULT([gr-audio-alsa requires package alsa, not 
found.])])
 
+    GRC_BUILD_CONDITIONAL([gr-audio-alsa],[
+       AC_SUBST(ALSA_LIBS)
        dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_alsa], [chmod +x 
gr-audio-alsa/src/run_tests])
-        subdirs="$subdirs gr-audio-alsa"
-    else
-       AC_MSG_RESULT([failed: $ALSA_PKG_ERRORS])
-       failed="$failed gr-audio-alsa"
-    fi
+    ])
 ])

Modified: gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-24 
03:03:46 UTC (rev 3387)
+++ gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-24 
03:16:33 UTC (rev 3388)
@@ -160,7 +160,7 @@
 GRC_GNURADIO_EXAMPLES
 GRC_USRP
 GRC_GR_USRP                    dnl this must come after GRC_USRP
-#GRC_GR_AUDIO_ALSA
+GRC_GR_AUDIO_ALSA
 #GRC_GR_AUDIO_JACK
 #GRC_GR_AUDIO_OSS
 #GRC_GR_AUDIO_OSX