X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=config%2Fgrc_gr_audio_osx.m4;h=95fbc17d55895213c6c180677169a49d9621b7f5;hb=88daa730d23983109b116e59331c11a11a1ef537;hp=66ba06226441bc6a2688211d0b9304b2b25b6fbc;hpb=287fc41d5f82ff3236aa270689bd55278e2c841a;p=debian%2Fgnuradio

diff --git a/config/grc_gr_audio_osx.m4 b/config/grc_gr_audio_osx.m4
index 66ba0622..95fbc17d 100644
--- a/config/grc_gr_audio_osx.m4
+++ b/config/grc_gr_audio_osx.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,23 +14,40 @@ 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_OSX],[
-    GRC_ENABLE([gr-audio-osx])
-    
+    GRC_ENABLE(gr-audio-osx)
+
+    dnl Don't do gr-audio-osx if omnithread or gnuradio-core skipped
+    GRC_CHECK_DEPENDENCY(gr-audio-osx, omnithread)
+    GRC_CHECK_DEPENDENCY(gr-audio-osx, 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
+        case "$host_os" in
+          darwin*)
+              MACOSX_AUDIOUNIT([],
+                  [passed=no;AC_MSG_RESULT([gr-audio-osx requires AudioUnit, not found.])])
+              ;;
+          *)
+              AC_MSG_RESULT([gr-audio-osx will build on Mac OS X and Darwin only.])
+              passed=no
+              ;;
+        esac
+    fi
+
     AC_CONFIG_FILES([ \
-	gr-audio-osx/Makefile \
-	gr-audio-osx/src/Makefile \
-	gr-audio-osx/src/run_tests \
+        gr-audio-osx/Makefile \
+        gr-audio-osx/src/Makefile \
+        gr-audio-osx/src/run_tests \
     ])
-    
-    passed=yes
-    MACOSX_AUDIOUNIT([],
-        [passed=no;AC_MSG_RESULT([gr-audio-osx requires AudioUnit, not found.])])
 
-    GRC_BUILD_CONDITIONAL([gr-audio-osx],[
+    GRC_BUILD_CONDITIONAL(gr-audio-osx,[
 	dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_osx], [chmod +x gr-audio-osx/src/run_tests])
     ])