-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,
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_USRP],[
- GRC_ENABLE([gr-usrp])
+ GRC_ENABLE(gr-usrp)
+
+ dnl Don't do gr-usrp if usrp or gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-usrp, usrp)
+ GRC_CHECK_DEPENDENCY(gr-usrp, gnuradio-core)
AC_CONFIG_FILES([ \
- gr-usrp/Makefile \
- gr-usrp/src/Makefile \
- gr-usrp/src/run_tests \
+ gr-usrp/Makefile \
+ gr-usrp/gnuradio-usrp.pc \
+ gr-usrp/src/Makefile \
+ gr-usrp/src/run_tests \
+ gr-usrp/apps/Makefile \
])
- passed=yes
- # Don't do gr-usrp if usrp skipped
- # There *has* to be a better way to check if a value is in a string
- for dir in $skipped_dirs
- do
- if test x$dir = xusrp; then
- AC_MSG_RESULT([Component gr-usrp requires usrp, which is not being built.])
- passed=no
- fi
- done
-
- GRC_BUILD_CONDITIONAL([gr-usrp],[
+ GRC_BUILD_CONDITIONAL(gr-usrp,[
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_usrp], [chmod +x gr-usrp/src/run_tests])
])