X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=config%2Fgrc_gr_audio_alsa.m4;h=d6955980d2868094828fd9cf195be26eac193f61;hb=04db1ec3b6dad9d984f7fe4314cca6937c94a1b0;hp=471d33b072621629e6a09a73c0720197cc609b83;hpb=42d9c6f495503d3d9d2db47a9979036c9233f976;p=debian%2Fgnuradio

diff --git a/config/grc_gr_audio_alsa.m4 b/config/grc_gr_audio_alsa.m4
index 471d33b0..d6955980 100644
--- a/config/grc_gr_audio_alsa.m4
+++ b/config/grc_gr_audio_alsa.m4
@@ -18,26 +18,29 @@ dnl the Free Software Foundation, Inc., 51 Franklin Street,
 dnl Boston, MA 02110-1301, USA.
 
 AC_DEFUN([GRC_GR_AUDIO_ALSA],[
-    GRC_ENABLE([gr-audio-alsa])
+    GRC_ENABLE(gr-audio-alsa)
 
-    AC_CONFIG_FILES([ \
-	gr-audio-alsa/Makefile \
-	gr-audio-alsa/src/Makefile \
-	gr-audio-alsa/src/run_tests \
-    ])
+    dnl Don't do gr-audio-alsa if gnuradio-core skipped
+    GRC_CHECK_DEPENDENCY(gr-audio-alsa, gnuradio-core)
 
-    passed=yes
-    # Don't do gr-audio-alsa if gnuradio-core skipped
-    if test x$gnuradio_core_skipped = xyes; then
-        AC_MSG_RESULT([Component gr-audio-osx requires gnuradio-core, which is not being built or specified via pre-installed files.])
-	passed=no
+    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-audio-alsa if the 'alsa' package is not installed.
+        PKG_CHECK_MODULES(ALSA, alsa >= 0.9,[],
+            [passed=no;AC_MSG_RESULT([gr-audio-alsa requires package alsa, not found.])])
     fi
-    # Don't do gr-audio-alsa if the 'alsa' package is not installed.
-    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)
+    AC_CONFIG_FILES([ \
+        gr-audio-alsa/Makefile \
+	gr-audio-alsa/gnuradio-audio-alsa.pc \
+        gr-audio-alsa/src/Makefile \
+        gr-audio-alsa/src/run_tests \
+    ])
+
+    GRC_BUILD_CONDITIONAL(gr-audio-alsa,[
 	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])
     ])