X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=config%2Fgrc_gr_audio_alsa.m4;h=9c653c1c255da8b8b302ea841efb826ceb18eaad;hb=503efe1fbe3822979b8aa3c868d3d13fbeb9af7f;hp=8b08c9f80ef8367f1ddbd5b506b9a5c63dde495b;hpb=287fc41d5f82ff3236aa270689bd55278e2c841a;p=debian%2Fgnuradio

diff --git a/config/grc_gr_audio_alsa.m4 b/config/grc_gr_audio_alsa.m4
index 8b08c9f8..9c653c1c 100644
--- a/config/grc_gr_audio_alsa.m4
+++ b/config/grc_gr_audio_alsa.m4
@@ -1,10 +1,10 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
 dnl 
 dnl This file is part of GNU Radio
 dnl 
 dnl GNU Radio is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2, or (at your option)
+dnl the Free Software Foundation; either version 3, or (at your option)
 dnl any later version.
 dnl 
 dnl GNU Radio is distributed in the hope that it will be useful,
@@ -14,24 +14,33 @@ dnl GNU General Public License for more details.
 dnl 
 dnl You should have received a copy of the GNU General Public License
 dnl along with GNU Radio; see the file COPYING.  If not, write to
-dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-dnl Boston, MA 02111-1307, USA.
+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)
+
+    dnl Don't do gr-audio-alsa if gnuradio-core skipped
+    GRC_CHECK_DEPENDENCY(gr-audio-alsa, gnuradio-core)
+
+    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
 
     AC_CONFIG_FILES([ \
-	gr-audio-alsa/Makefile \
-	gr-audio-alsa/src/Makefile \
-	gr-audio-alsa/src/run_tests \
+        gr-audio-alsa/Makefile \
+	gr-audio-alsa/gr-audio-alsa.pc \
+        gr-audio-alsa/src/Makefile \
+        gr-audio-alsa/src/run_tests \
     ])
 
-    passed=yes
-    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)
+    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])
     ])