diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/Makefile.am | 2 | ||||
| -rw-r--r-- | config/grc_gnuradio_core.m4 | 2 | ||||
| -rw-r--r-- | config/grc_gnuradio_examples.m4 | 1 | ||||
| -rw-r--r-- | config/grc_gr_comedi.m4 | 2 | ||||
| -rw-r--r-- | config/grc_gr_cvsd_vocoder.m4 | 39 | ||||
| -rw-r--r-- | config/grc_gr_gsm_fr_vocoder.m4 | 40 | ||||
| -rw-r--r-- | config/grc_gr_vocoder.m4 | 49 |
7 files changed, 51 insertions, 84 deletions
diff --git a/config/Makefile.am b/config/Makefile.am index 473f88488..3eaa5e748 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -54,12 +54,12 @@ m4macros = \ grc_gr_audio.m4 \ grc_gr_comedi.m4 \ grc_gr_gcell.m4 \ - grc_gr_gsm_fr_vocoder.m4 \ grc_gr_noaa.m4 \ grc_gr_radio_astronomy.m4 \ grc_gr_trellis.m4 \ grc_gr_usrp.m4 \ grc_gr_video_sdl.m4 \ + grc_gr_vocoder.m4 \ grc_gr_wxgui.m4 \ grc_gruel.m4 \ gr_check_createfilemapping.m4 \ diff --git a/config/grc_gnuradio_core.m4 b/config/grc_gnuradio_core.m4 index c67696c7d..a35629e2e 100644 --- a/config/grc_gnuradio_core.m4 +++ b/config/grc_gnuradio_core.m4 @@ -86,7 +86,6 @@ AC_DEFUN([GRC_GNURADIO_CORE],[ gnuradio-core/src/guile/gr-run-waveform-script \ gnuradio-core/src/lib/Makefile \ gnuradio-core/src/lib/filter/Makefile \ - gnuradio-core/src/lib/g72x/Makefile \ gnuradio-core/src/lib/general/Makefile \ gnuradio-core/src/lib/general/gr_constants.cc \ gnuradio-core/src/lib/gengen/Makefile \ @@ -106,7 +105,6 @@ AC_DEFUN([GRC_GNURADIO_CORE],[ gnuradio-core/src/python/gnuradio/gr/run_tests \ gnuradio-core/src/python/gnuradio/gru/Makefile \ gnuradio-core/src/python/gnuradio/gruimpl/Makefile \ - gnuradio-core/src/python/gnuradio/vocoder/Makefile \ gnuradio-core/src/tests/Makefile \ gnuradio-core/src/utils/Makefile \ ]) diff --git a/config/grc_gnuradio_examples.m4 b/config/grc_gnuradio_examples.m4 index 6dff01943..780c072c7 100644 --- a/config/grc_gnuradio_examples.m4 +++ b/config/grc_gnuradio_examples.m4 @@ -32,7 +32,6 @@ AC_DEFUN([GRC_GNURADIO_EXAMPLES],[ gnuradio-examples/python/apps/hf_radio/Makefile \ gnuradio-examples/python/apps/Makefile \ gnuradio-examples/python/digital/Makefile \ - gnuradio-examples/python/digital_voice/Makefile \ gnuradio-examples/python/digital-bert/Makefile \ gnuradio-examples/python/mp-sched/Makefile \ gnuradio-examples/python/multi-antenna/Makefile \ diff --git a/config/grc_gr_comedi.m4 b/config/grc_gr_comedi.m4 index 5e3089417..7e54b0f5a 100644 --- a/config/grc_gr_comedi.m4 +++ b/config/grc_gr_comedi.m4 @@ -29,7 +29,7 @@ AC_DEFUN([GRC_GR_COMEDI],[ dnl no : otherwise if test $passed = yes; then dnl Don't do gr-comedi if the 'comedi' library is unavailable. - PKG_CHECK_MODULES(COMEDI, comedilib < 0.8,[], + PKG_CHECK_MODULES(COMEDI, comedilib >= 0.8,[], [passed=no;AC_MSG_RESULT([gr-comedi requires comedilib, not found.])]) fi diff --git a/config/grc_gr_cvsd_vocoder.m4 b/config/grc_gr_cvsd_vocoder.m4 deleted file mode 100644 index ddf6f9b2f..000000000 --- a/config/grc_gr_cvsd_vocoder.m4 +++ /dev/null @@ -1,39 +0,0 @@ -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 3, or (at your option) -dnl any later version. -dnl -dnl GNU Radio is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -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., 51 Franklin Street, -dnl Boston, MA 02110-1301, USA. - -AC_DEFUN([GRC_GR_CVSD_VOCODER],[ - GRC_ENABLE(gr-cvsd-vocoder) - - dnl Don't do gr-cvsd-vocoder if gnuradio-core skipped - GRC_CHECK_DEPENDENCY(gr-cvsd-vocoder, gnuradio-core) - - AC_CONFIG_FILES([\ - gr-cvsd-vocoder/Makefile \ - gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc \ - gr-cvsd-vocoder/src/Makefile \ - gr-cvsd-vocoder/src/lib/Makefile \ - gr-cvsd-vocoder/src/python/Makefile \ - gr-cvsd-vocoder/src/python/run_tests \ - ]) - - GRC_BUILD_CONDITIONAL(gr-cvsd-vocoder,[ - dnl run_tests is created from run_tests.in. Make it executable. - AC_CONFIG_COMMANDS([run_tests_cvsd], [chmod +x gr-cvsd-vocoder/src/python/run_tests]) - ]) -]) diff --git a/config/grc_gr_gsm_fr_vocoder.m4 b/config/grc_gr_gsm_fr_vocoder.m4 deleted file mode 100644 index a93d4edb7..000000000 --- a/config/grc_gr_gsm_fr_vocoder.m4 +++ /dev/null @@ -1,40 +0,0 @@ -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 3, or (at your option) -dnl any later version. -dnl -dnl GNU Radio is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -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., 51 Franklin Street, -dnl Boston, MA 02110-1301, USA. - -AC_DEFUN([GRC_GR_GSM_FR_VOCODER],[ - GRC_ENABLE(gr-gsm-fr-vocoder) - - dnl Don't do gr-gsm-fr-vocoder if gnuradio-core skipped - GRC_CHECK_DEPENDENCY(gr-gsm-fr-vocoder, gnuradio-core) - - AC_CONFIG_FILES([\ - gr-gsm-fr-vocoder/Makefile \ - gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc \ - gr-gsm-fr-vocoder/src/Makefile \ - gr-gsm-fr-vocoder/src/lib/Makefile \ - gr-gsm-fr-vocoder/src/lib/gsm/Makefile \ - gr-gsm-fr-vocoder/src/python/Makefile \ - gr-gsm-fr-vocoder/src/python/run_tests \ - ]) - - GRC_BUILD_CONDITIONAL(gr-gsm-fr-vocoder,[ - dnl run_tests is created from run_tests.in. Make it executable. - AC_CONFIG_COMMANDS([run_tests_gsm], [chmod +x gr-gsm-fr-vocoder/src/python/run_tests]) - ]) -]) diff --git a/config/grc_gr_vocoder.m4 b/config/grc_gr_vocoder.m4 new file mode 100644 index 000000000..df75656fe --- /dev/null +++ b/config/grc_gr_vocoder.m4 @@ -0,0 +1,49 @@ +dnl Copyright 2011 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 3, or (at your option) +dnl any later version. +dnl +dnl GNU Radio is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +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., 51 Franklin Street, +dnl Boston, MA 02110-1301, USA. + +AC_DEFUN([GRC_GR_VOCODER],[ + GRC_ENABLE(gr-vocoder) + + dnl Don't do gr-vocoder if gnuradio-core skipped + GRC_CHECK_DEPENDENCY(gr-fr-vocoder, gnuradio-core) + + AC_CONFIG_FILES([\ + gr-vocoder/Makefile \ + gr-vocoder/gnuradio-vocoder.pc \ + gr-vocoder/apps/Makefile \ + gr-vocoder/doc/Makefile \ + gr-vocoder/examples/Makefile \ + gr-vocoder/grc/Makefile \ + gr-vocoder/include/Makefile \ + gr-vocoder/lib/Makefile \ + gr-vocoder/lib/codec2/Makefile \ + gr-vocoder/lib/g7xx/Makefile \ + gr-vocoder/lib/gsm/Makefile \ + gr-vocoder/python/Makefile \ + gr-vocoder/python/run_tests \ + gr-vocoder/swig/Makefile \ + gr-vocoder/swig/run_guile_tests \ + ]) + + GRC_BUILD_CONDITIONAL(gr-vocoder,[ + dnl run_tests is created from run_tests.in. Make it executable. + AC_CONFIG_COMMANDS([run_tests_vocoder], [chmod +x gr-vocoder/python/run_tests]) + AC_CONFIG_COMMANDS([run_tests_vocoder_guile], [chmod +x gr-vocoder/swig/run_guile_tests]) + ]) +]) |