Merged gcell, the Cell SPE scheduler and RPC mechanism into the trunk.

[debian/gnuradio] / config / grc_gr_audio_jack.m4

diff --git a/config/grc_gr_audio_jack.m4 b/config/grc_gr_audio_jack.m4
index 0aa44e063eb1d4bba6fba1020607ec69b3b198a2..cb7bf2990fc1ebf573ecc7b4a56388080925dafc 100644 (file)
--- a/config/grc_gr_audio_jack.m4
+++ b/config/grc_gr_audio_jack.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 
 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,
 dnl any later version.
 dnl 
 dnl GNU Radio is distributed in the hope that it will be useful,


@@ -14,28 +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 
 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_JACK],[
 
 AC_DEFUN([GRC_GR_AUDIO_JACK],[

-    AC_CONFIG_SRCDIR([gr-audio-jack/src/audio_jack.i])
+    GRC_ENABLE(gr-audio-jack)
+
+    dnl Don't do gr-audio-jack if gnuradio-core skipped
+    GRC_CHECK_DEPENDENCY(gr-audio-jack, 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-jack if in 'jack' isn't installed
+        PKG_CHECK_MODULES(JACK, jack >= 0.8, [],
+            [passed=no;AC_MSG_RESULT([gr-audio-jack requires package jack, not found.])])
+    fi

 
     AC_CONFIG_FILES([ \
 
     AC_CONFIG_FILES([ \

-       gr-audio-jack/Makefile \
+        gr-audio-jack/Makefile \

         gr-audio-jack/src/Makefile \
         gr-audio-jack/src/Makefile \

-       gr-audio-jack/src/run_tests \
+        gr-audio-jack/src/run_tests \

     ])
 
     ])
 

-    succeeded=yes
-    PKG_CHECK_MODULES(JACK, jack >= 0.8,[],[succeeded=no])
-    if test $succeeded = yes; then
-        LIBS="$LIBS $JACK_LIBS"
-
+    GRC_BUILD_CONDITIONAL(gr-audio-jack,[

        dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_jack], [chmod +x gr-audio-jack/src/run_tests])
        dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_jack], [chmod +x gr-audio-jack/src/run_tests])

-        subdirs="$subdirs gr-audio-jack"
-    else
-       AC_MSG_RESULT([failed: $JACK_PKG_ERRORS])
-       failed="$failed gr-audio-jack"
-    fi
+    ])

 ])
 ])