projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Combined additiona usrp_prims code
[debian/gnuradio]
/
config
/
grc_gr_atsc.m4
diff --git
a/config/grc_gr_atsc.m4
b/config/grc_gr_atsc.m4
index f49ca7c76bd4d516c2b5e5f588d05818b1f7ff61..6dfb40132e549a6cdb0f3d4681eaf4b559caeab0 100644
(file)
--- a/
config/grc_gr_atsc.m4
+++ b/
config/grc_gr_atsc.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,23
+14,26
@@
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., 5
9 Temple Place - Suite 330
,
-dnl Boston, MA 0211
1-1307
, USA.
+dnl the Free Software Foundation, Inc., 5
1 Franklin Street
,
+dnl Boston, MA 0211
0-1301
, USA.
AC_DEFUN([GRC_GR_ATSC],[
AC_DEFUN([GRC_GR_ATSC],[
- GRC_ENABLE([gr-atsc])
+ GRC_ENABLE(gr-atsc)
+
+ dnl Don't do gr-atsc if gnuradio-core skipped
+ GRC_CHECK_DEPENDENCY(gr-atsc, gnuradio-core)
AC_CONFIG_FILES([\
AC_CONFIG_FILES([\
- gr-atsc/Makefile \
- gr-atsc/doc/Makefile \
- gr-atsc/src/Makefile \
- gr-atsc/src/lib/Makefile \
- gr-atsc/src/python/Makefile \
- gr-atsc/src/python/run_tests \
+ gr-atsc/Makefile \
+ gr-atsc/gnuradio-atsc.pc \
+ gr-atsc/doc/Makefile \
+ gr-atsc/src/Makefile \
+ gr-atsc/src/lib/Makefile \
+ gr-atsc/src/python/Makefile \
+ gr-atsc/src/python/run_tests \
])
])
- passed=yes
- GRC_BUILD_CONDITIONAL([gr-atsc],[
+ GRC_BUILD_CONDITIONAL(gr-atsc,[
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_atsc], [chmod +x gr-atsc/src/python/run_tests])
])
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_atsc], [chmod +x gr-atsc/src/python/run_tests])
])