From 54179f7f860dcf8bc986fd90a22a5be8322b5fdf Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 24 Feb 2010 14:42:25 -0800 Subject: Created gr uhd skeleton build. Checks uhd pkg config and gens the makefiles. --- config/grc_gr_uhd.m4 | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 config/grc_gr_uhd.m4 (limited to 'config') diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4 new file mode 100644 index 000000000..c3c701dbd --- /dev/null +++ b/config/grc_gr_uhd.m4 @@ -0,0 +1,44 @@ +dnl Copyright 2010 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_UHD],[ + GRC_ENABLE(gr-uhd) + + dnl Dont do gr-uhd if gnuradio-core skipped + GRC_CHECK_DEPENDENCY(gr-uhd, gnuradio-core) + + if test $passed = yes; then + PKG_CHECK_MODULES( + [UHD], [uhd], [], + [passed=no; AC_MSG_RESULT([gr-uhd requires libuhd])] + ) + AC_SUBST(UHD_CFLAGS) + AC_SUBST(UHD_LIBS) + fi + + AC_CONFIG_FILES([ \ + gr-uhd/Makefile \ + gr-uhd/apps/Makefile \ + gr-uhd/grc/Makefile \ + gr-uhd/lib/Makefile \ + gr-uhd/swig/Makefile \ + ]) + + GRC_BUILD_CONDITIONAL(gr-uhd) +]) -- cgit From 999bba14d657a11fa9bfc1b9587e1341e2f28e07 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Fri, 23 Apr 2010 10:11:53 -0700 Subject: added docs to uhd grc blocks, added pkg config path to make support easier --- config/grc_gr_uhd.m4 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'config') diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4 index c3c701dbd..870a8abc6 100644 --- a/config/grc_gr_uhd.m4 +++ b/config/grc_gr_uhd.m4 @@ -24,6 +24,9 @@ AC_DEFUN([GRC_GR_UHD],[ GRC_CHECK_DEPENDENCY(gr-uhd, gnuradio-core) if test $passed = yes; then + #by default, cmake likes to install the uhd.pc file here + #so lets make life easier for everybody and add this path + export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig PKG_CHECK_MODULES( [UHD], [uhd], [], [passed=no; AC_MSG_RESULT([gr-uhd requires libuhd])] -- cgit From 71c193ad5380829e20af533ed89903d8d7abcd2c Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Tue, 14 Sep 2010 11:55:55 -0700 Subject: Remove PKG_CONFIG_PATH addition from grc_gr_udh.m4 --- config/grc_gr_uhd.m4 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'config') diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4 index 870a8abc6..090187c04 100644 --- a/config/grc_gr_uhd.m4 +++ b/config/grc_gr_uhd.m4 @@ -24,9 +24,7 @@ AC_DEFUN([GRC_GR_UHD],[ GRC_CHECK_DEPENDENCY(gr-uhd, gnuradio-core) if test $passed = yes; then - #by default, cmake likes to install the uhd.pc file here - #so lets make life easier for everybody and add this path - export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig + dnl Don't do gr-uhd if the 'uhd' package is not installed PKG_CHECK_MODULES( [UHD], [uhd], [], [passed=no; AC_MSG_RESULT([gr-uhd requires libuhd])] -- cgit From d072f53d3aafc68821e2450ac6876614dc0b1713 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Tue, 5 Oct 2010 13:34:15 -0700 Subject: Remove vrt dependence on gruel. Should also build on non-Linux OS's too. --- config/grc_vrt.m4 | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'config') diff --git a/config/grc_vrt.m4 b/config/grc_vrt.m4 index 982c8863a..63b0a5e35 100644 --- a/config/grc_vrt.m4 +++ b/config/grc_vrt.m4 @@ -25,8 +25,7 @@ AC_DEFUN([GRC_VRT],[ dnl yes : if the --enable code passed muster and all dependencies are met dnl no : otherwise if test $passed = yes; then - dnl Needed for vrt_socket_opener - AC_CHECK_HEADERS(arpa/inet.h byteswap.h linux/if_packet.h sys/socket.h sys/un.h) + AC_CHECK_HEADERS(arpa/inet.h sys/socket.h) fi if test $passed != with; then dnl how and where to find INCLUDES and LA @@ -34,19 +33,6 @@ AC_DEFUN([GRC_VRT],[ VRT_LA="\${abs_top_builddir}/vrt/lib/libvrt.la" fi - # Test host OS compatibility - AC_MSG_CHECKING([whether host_os is linux*]) - case "$host_os" in - linux*) - AC_MSG_RESULT([yes]) - ;; - *) - AC_MSG_RESULT([no]) - AC_MSG_NOTICE([libvrt currently requires Linux host OS, not found]) - passed="no" - ;; - esac - dnl Include the vrt INCLUDES and LA AC_SUBST(VRT_INCLUDES) AC_SUBST(VRT_LA) -- cgit From cf3270ff70ab46a2446eeb72373f6ecc96b9669c Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Tue, 5 Oct 2010 21:41:19 -0700 Subject: Remove vrt from build. The vrt code has been temporarily moved to Eric's Out-of-Tree repository, pending the "Grand Build System Reorganization". To grab the code and build it: $ git clone git://gnuradio.org/eb-oot $ cd eb-oot/vrt $ ./bootstrap && ./configure $ make && make check && make install --- config/Makefile.am | 1 - config/grc_vrt.m4 | 50 -------------------------------------------------- 2 files changed, 51 deletions(-) delete mode 100644 config/grc_vrt.m4 (limited to 'config') diff --git a/config/Makefile.am b/config/Makefile.am index 959b8f014..4dc7216f1 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -70,7 +70,6 @@ m4macros = \ grc_gr_video_sdl.m4 \ grc_gr_wxgui.m4 \ grc_gruel.m4 \ - grc_vrt.m4 \ gr_check_createfilemapping.m4 \ gr_check_mc4020.m4 \ gr_check_shm_open.m4 \ diff --git a/config/grc_vrt.m4 b/config/grc_vrt.m4 deleted file mode 100644 index 63b0a5e35..000000000 --- a/config/grc_vrt.m4 +++ /dev/null @@ -1,50 +0,0 @@ -dnl Copyright 2008,2009 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_VRT],[ - GRC_ENABLE(vrt) - - 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 - AC_CHECK_HEADERS(arpa/inet.h sys/socket.h) - fi - if test $passed != with; then - dnl how and where to find INCLUDES and LA - VRT_INCLUDES="-I\${abs_top_srcdir}/vrt/include" - VRT_LA="\${abs_top_builddir}/vrt/lib/libvrt.la" - fi - - dnl Include the vrt INCLUDES and LA - AC_SUBST(VRT_INCLUDES) - AC_SUBST(VRT_LA) - - AC_CONFIG_FILES([ - vrt/Makefile - vrt/vrt.pc - vrt/include/Makefile - vrt/include/vrt/Makefile - vrt/lib/Makefile - vrt/apps/Makefile - ]) - - GRC_BUILD_CONDITIONAL(vrt) -]) -- cgit From b932cd640044f4ccedaca201840f983acf4bef16 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Wed, 13 Oct 2010 16:41:44 -0600 Subject: add support for using Tcl and Guile as output languages --- config/gr_swig.m4 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'config') diff --git a/config/gr_swig.m4 b/config/gr_swig.m4 index cdb28055c..826661f53 100644 --- a/config/gr_swig.m4 +++ b/config/gr_swig.m4 @@ -83,3 +83,27 @@ dnl AC_SUBST(SWIG_PYTHON_OPT,[-python$swig_shadow]) fi AC_SUBST(SWIG_PYTHON_CPPFLAGS,[$PYTHON_CPPFLAGS]) ]) + +AC_DEFUN([SWIG_TCL],[ + AC_REQUIRE([SWIG_PROG]) + AC_REQUIRE([TCL_DEVEL]) + if test "$SWIG" != "false" ; then + AC_SUBST(SWIG_TCL_LIB,[-ltcl]) +dnl test ! "x$1" = "xno" && swig_shadow=" -shadow" || swig_shadow="" +dnl AC_SUBST(SWIG_PYTHON_OPT,[-python$swig_shadow]) + AC_SUBST(SWIG_TCL_OPT,[-tcl]) + fi + AC_SUBST(SWIG_TCL_CPPFLAGS,[$TCL_CPPFLAGS]) +]) + +AC_DEFUN([SWIG_GUILE],[ + AC_REQUIRE([SWIG_PROG]) + AC_REQUIRE([GUILE_DEVEL]) + if test "$SWIG" != "false" ; then + AC_SUBST(SWIG_GUILE_LIB,[-lguile]) +dnl test ! "x$1" = "xno" && swig_shadow=" -shadow" || swig_shadow="" +dnl AC_SUBST(SWIG_PYTHON_OPT,[-python$swig_shadow]) + AC_SUBST(SWIG_GUILE_OPT,[-guile]) + fi + AC_SUBST(SWIG_GUILE_CPPFLAGS,[$GUILE_CPPFLAGS]) +]) -- cgit From 29e800af251d748bfb48b8409e89136be06aab82 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Wed, 13 Oct 2010 16:44:13 -0600 Subject: add support for using Tcl and Guile as output languages --- config/gr_scripting.m4 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/gr_scripting.m4 b/config/gr_scripting.m4 index e030a8102..001f3b7e3 100644 --- a/config/gr_scripting.m4 +++ b/config/gr_scripting.m4 @@ -26,5 +26,16 @@ AC_DEFUN([GR_SCRIPTING],[ SWIG_PROG(1.3.31) SWIG_ENABLE_CXX - SWIG_PYTHON + dnl We need python at build time, as it's used as for utilities. If python + dnl isn't enabled, then we don't want the SWIG support for python. + AC_REQUIRE([AM_PATH_PYTHON]) + if test x${enable_python} = xyes; then + SWIG_PYTHON + fi + if test x${enable_tcl} = xyes; then + SWIG_TCL + fi + if test x${enable_guile} = xyes; then + SWIG_GUILE + fi ]) -- cgit From 1642681085969f2ab737e4b8dff12834778b2ee1 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Wed, 13 Oct 2010 16:45:40 -0600 Subject: add stubs for finding what is needed to use guile or tcl --- config/gr_guile.m4 | 49 ++++++++++++++++++++++++++++++++++++++ config/gr_tcl.m4 | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100644 config/gr_guile.m4 create mode 100644 config/gr_tcl.m4 (limited to 'config') diff --git a/config/gr_guile.m4 b/config/gr_guile.m4 new file mode 100644 index 000000000..53cc5fce9 --- /dev/null +++ b/config/gr_guile.m4 @@ -0,0 +1,49 @@ +dnl +dnl Copyright 2003,2004,2005 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. +dnl + +# GUILE_DEVEL() +# +# Checks for Guile and tries to get the include path to 'Guile.h'. +# It sets the $(GUILE_CPPFLAGS), $(GUILE_LDFLAGS) and $(guiledir) output variables, +# +AC_DEFUN([GUILE_DEVEL],[ + dnl see if GUILE is installed + AC_PATH_PROG(GUILE,guile) +]) + +# GUILE_CHECK_MODULE +# +# Determines if a particular Guile module can be imported +# +# $1 - module name +# $2 - module description +# $3 - action if found +# $4 - action if not found +# $5 - test command + +AC_DEFUN([GUILE_CHECK_MODULE],[ + AC_MSG_CHECKING([for $2]) + dnl ######################################## + dnl # import and test checking + dnl ######################################## + dnl if test x${enable_guile} = xyes; then + dnl fi +]) diff --git a/config/gr_tcl.m4 b/config/gr_tcl.m4 new file mode 100644 index 000000000..106bc6515 --- /dev/null +++ b/config/gr_tcl.m4 @@ -0,0 +1,69 @@ +dnl +dnl Copyright 2003,2004,2005 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. +dnl + +# TCL_DEVEL() +# +# Checks for Tcl and tries to get the include path to 'Tcl.h'. +# It sets the $(TCL_CPPFLAGS), $(TCL_LDFLAGS) and $(tcldir) output variables, +# +AC_DEFUN([TCL_DEVEL],[ + dnl see if tclsh is installed + if test x${enable_tcl} = xyes; then + AC_PATH_PROG(TCLSH,tclsh) + + AC_REQUIRE([AC_CANONICAL_HOST]) + + AC_ARG_WITH(tcldir, + AC_HELP_STRING([--with-tcldir=DIR], + [tcl installation directory (cross-compiling) [[default=$prefix/lib/tcl2.5/site-packages]]]), + [with_tcldir=${withval}],[with_tcldir=${prefix}/lib/tcl2.5/site-packages]) + + # if we're cross-compiling, asking the host tcl about any of + # this is completely useless... + + dnl if test x$cross_compiling != xno; then + dnl tcldir=$with_tcldir + dnl pyexecdir=$with_tcldir + dnl AC_SUBST(TCL_CPPFLAGS) + dnl AC_SUBST(TCL_LDFLAGS) + dnl else + dnl fi + fi +]) + +# TCL_CHECK_MODULE +# +# Determines if a particular Tcl module can be imported +# +# $1 - module name +# $2 - module description +# $3 - action if found +# $4 - action if not found +# $5 - test command + +AC_DEFUN([TCL_CHECK_MODULE],[ + AC_MSG_CHECKING([for $2]) + dnl ######################################## + dnl # import and test checking + dnl ######################################## + dnl if test x${enable_tcl} = xyes; then + dnl fi +]) -- cgit From 1c127150b90e3f2823dfeabc647e9dbc4f446252 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Wed, 13 Oct 2010 21:42:46 -0600 Subject: minimal test for guile flags --- config/gr_guile.m4 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/gr_guile.m4 b/config/gr_guile.m4 index 53cc5fce9..ccf817031 100644 --- a/config/gr_guile.m4 +++ b/config/gr_guile.m4 @@ -26,7 +26,10 @@ dnl # AC_DEFUN([GUILE_DEVEL],[ dnl see if GUILE is installed - AC_PATH_PROG(GUILE,guile) + AC_PATH_PROG(GUILE, guile) + GUILE_CFLAGS="" + GUILE_LIBS="-lguile" + AC_SUBST(GUILE_LIBS) ]) # GUILE_CHECK_MODULE -- cgit From 08860508f2d28a439fee8242cbf96e3867486af2 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Sun, 17 Oct 2010 12:10:33 -0600 Subject: use guile-config to find the proper flags --- config/gr_guile.m4 | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/gr_guile.m4 b/config/gr_guile.m4 index ccf817031..f6cc15216 100644 --- a/config/gr_guile.m4 +++ b/config/gr_guile.m4 @@ -27,8 +27,16 @@ dnl AC_DEFUN([GUILE_DEVEL],[ dnl see if GUILE is installed AC_PATH_PROG(GUILE, guile) - GUILE_CFLAGS="" - GUILE_LIBS="-lguile" + dnl get the config program + AC_PATH_PROG(GUILE_CONFIG, guile-config) + if test x${GUILE_CONFIG} != x; then + GUILE_CFLAGS="`${GUILE_CONFIG} compile`" + GUILE_LIBS="`${GUILE_CONFIG} link`" + else + GUILE_CFLAGS="" + GUILE_LIBS="Wl,-Bsymbolic-functions -lguile lgmp -lcrypt" + fi + AC_SUBST(GUILE_CFLAGS) AC_SUBST(GUILE_LIBS) ]) -- cgit From 478398e431d1d20a7095d3b78b15e388eb71318e Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 18 Oct 2010 17:45:30 -0600 Subject: add variables for the data and lib directories as specified by guile-config --- config/gr_guile.m4 | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'config') diff --git a/config/gr_guile.m4 b/config/gr_guile.m4 index f6cc15216..90d4dfe9d 100644 --- a/config/gr_guile.m4 +++ b/config/gr_guile.m4 @@ -32,11 +32,16 @@ AC_DEFUN([GUILE_DEVEL],[ if test x${GUILE_CONFIG} != x; then GUILE_CFLAGS="`${GUILE_CONFIG} compile`" GUILE_LIBS="`${GUILE_CONFIG} link`" + GUILE_PKLIBDIR="`${GUILE_CONFIG} info pkglibdir`" + GUILE_PKDATADIR="`${GUILE_CONFIG} info pkgdatadir`/site" else GUILE_CFLAGS="" + GUILE_PKLIBDIR="" GUILE_LIBS="Wl,-Bsymbolic-functions -lguile lgmp -lcrypt" fi AC_SUBST(GUILE_CFLAGS) + AC_SUBST(GUILE_PKLIBDIR) + AC_SUBST(GUILE_PKDATADIR) AC_SUBST(GUILE_LIBS) ]) -- cgit From 81867e5dfd939d8afdacbe22c6e2d41d4bc4b37e Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 5 Nov 2010 19:43:33 -0700 Subject: Create guile QA framework. Also moves hand coded files out of gnuradio-core/src/lib/swig/gnuradio that were getting nuked by make clean. --- config/grc_gnuradio_core.m4 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/grc_gnuradio_core.m4 b/config/grc_gnuradio_core.m4 index 269634324..8cbba49ef 100644 --- a/config/grc_gnuradio_core.m4 +++ b/config/grc_gnuradio_core.m4 @@ -81,6 +81,8 @@ AC_DEFUN([GRC_GNURADIO_CORE],[ gnuradio-core/gnuradio-core.pc \ gnuradio-core/src/Makefile \ gnuradio-core/src/gen_interpolator_taps/Makefile \ + gnuradio-core/src/guile/Makefile \ + gnuradio-core/src/guile/run_guile_tests \ gnuradio-core/src/lib/Makefile \ gnuradio-core/src/lib/filter/Makefile \ gnuradio-core/src/lib/g72x/Makefile \ @@ -110,6 +112,10 @@ AC_DEFUN([GRC_GNURADIO_CORE],[ GRC_BUILD_CONDITIONAL(gnuradio-core, [ dnl run_tests is created from run_tests.in. Make it executable. - AC_CONFIG_COMMANDS([run_tests_core],[chmod +x gnuradio-core/src/python/gnuradio/gr/run_tests]) + AC_CONFIG_COMMANDS([run_tests_core], + [ + chmod +x gnuradio-core/src/python/gnuradio/gr/run_tests + chmod +x gnuradio-core/src/guile/run_guile_tests + ]) ]) ]) -- cgit From f4959dce1e5ec6b61c10df489c2421d56963beb3 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sun, 7 Nov 2010 16:02:24 -0800 Subject: guile-test -> guile-test.in so we can use @GUILE@ --- config/grc_gnuradio_core.m4 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config') diff --git a/config/grc_gnuradio_core.m4 b/config/grc_gnuradio_core.m4 index 8cbba49ef..5095f18f7 100644 --- a/config/grc_gnuradio_core.m4 +++ b/config/grc_gnuradio_core.m4 @@ -83,6 +83,7 @@ AC_DEFUN([GRC_GNURADIO_CORE],[ gnuradio-core/src/gen_interpolator_taps/Makefile \ gnuradio-core/src/guile/Makefile \ gnuradio-core/src/guile/run_guile_tests \ + gnuradio-core/src/guile/gnuradio/test-suite/guile-test \ gnuradio-core/src/lib/Makefile \ gnuradio-core/src/lib/filter/Makefile \ gnuradio-core/src/lib/g72x/Makefile \ @@ -116,6 +117,7 @@ AC_DEFUN([GRC_GNURADIO_CORE],[ [ chmod +x gnuradio-core/src/python/gnuradio/gr/run_tests chmod +x gnuradio-core/src/guile/run_guile_tests + chmod +x gnuradio-core/src/guile/gnuradio/test-suite ]) ]) ]) -- cgit From d1d804742ac2cfcc31240c6d74d764e5784831d4 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sun, 7 Nov 2010 17:46:36 -0800 Subject: Make check works again, now using guile's native test-suite code. The srfi-64 code wouldn't pass it's own test code under guile... --- config/grc_gnuradio_core.m4 | 2 -- 1 file changed, 2 deletions(-) (limited to 'config') diff --git a/config/grc_gnuradio_core.m4 b/config/grc_gnuradio_core.m4 index 5095f18f7..8cbba49ef 100644 --- a/config/grc_gnuradio_core.m4 +++ b/config/grc_gnuradio_core.m4 @@ -83,7 +83,6 @@ AC_DEFUN([GRC_GNURADIO_CORE],[ gnuradio-core/src/gen_interpolator_taps/Makefile \ gnuradio-core/src/guile/Makefile \ gnuradio-core/src/guile/run_guile_tests \ - gnuradio-core/src/guile/gnuradio/test-suite/guile-test \ gnuradio-core/src/lib/Makefile \ gnuradio-core/src/lib/filter/Makefile \ gnuradio-core/src/lib/g72x/Makefile \ @@ -117,7 +116,6 @@ AC_DEFUN([GRC_GNURADIO_CORE],[ [ chmod +x gnuradio-core/src/python/gnuradio/gr/run_tests chmod +x gnuradio-core/src/guile/run_guile_tests - chmod +x gnuradio-core/src/guile/gnuradio/test-suite ]) ]) ]) -- cgit From 76e2fa796a42df7951f05f73428e178c84879b79 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 12 Nov 2010 15:04:10 -0800 Subject: make check in gr-audio-alsa now confirms ability to load guile bindings. --- config/grc_gr_audio_alsa.m4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/grc_gr_audio_alsa.m4 b/config/grc_gr_audio_alsa.m4 index d6955980d..35389d81d 100644 --- a/config/grc_gr_audio_alsa.m4 +++ b/config/grc_gr_audio_alsa.m4 @@ -37,11 +37,13 @@ AC_DEFUN([GRC_GR_AUDIO_ALSA],[ gr-audio-alsa/Makefile \ gr-audio-alsa/gnuradio-audio-alsa.pc \ gr-audio-alsa/src/Makefile \ + gr-audio-alsa/src/run_guile_tests \ gr-audio-alsa/src/run_tests \ ]) GRC_BUILD_CONDITIONAL(gr-audio-alsa,[ dnl run_tests is created from run_tests.in. Make it executable. - AC_CONFIG_COMMANDS([run_tests_alsa], [chmod +x gr-audio-alsa/src/run_tests]) + AC_CONFIG_COMMANDS([run_tests_alsa], + [chmod +x gr-audio-alsa/src/run_tests gr-audio-alsa/src/run_guile_tests]) ]) ]) -- cgit From abde5affda1533c518cce06d5edcffa4eda52340 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sat, 13 Nov 2010 16:19:48 -0800 Subject: dail-tone.wfd example waveform can be loaded and run by gr-run-waveform. Write new app, gr-run-waveform, that reads waveforms and runs them. We'll need to turn this into a small piece of C/C++ code that embeds guile, but the guts of it is working. --- config/Makefile.am | 1 + config/grc_gr_guile.m4 | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 config/grc_gr_guile.m4 (limited to 'config') diff --git a/config/Makefile.am b/config/Makefile.am index 4dc7216f1..f5f478cff 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -61,6 +61,7 @@ m4macros = \ grc_gr_gcell.m4 \ grc_gr_gpio.m4 \ grc_gr_gsm_fr_vocoder.m4 \ + grc_gr_guile.m4 \ grc_gr_noaa.m4 \ grc_gr_radar_mono.m4 \ grc_gr_radio_astronomy.m4 \ diff --git a/config/grc_gr_guile.m4 b/config/grc_gr_guile.m4 new file mode 100644 index 000000000..35d6834eb --- /dev/null +++ b/config/grc_gr_guile.m4 @@ -0,0 +1,36 @@ +dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2009,2010 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_GUILE],[ + GRC_ENABLE(gr-guile) + + dnl Don't do gr-guile if gnuradio-core skipped + GRC_CHECK_DEPENDENCY(gr-guile, gnuradio-core) + + AC_CONFIG_FILES([ \ + gr-guile/Makefile \ + gr-guile/apps/Makefile \ + gr-guile/example-waveforms/Makefile \ + ]) + + GRC_BUILD_CONDITIONAL(gr-guile,[ + dnl run_tests is created from run_tests.in. Make it executable. + dnl AC_CONFIG_COMMANDS([run_tests_guile], [chmod +x gr-guile/apps/run_guile_tests]) + ]) +]) -- cgit From 6129a67cf6527a0f0dc8b83df108c4fe2147155b Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Wed, 17 Nov 2010 18:29:22 -0700 Subject: don't look for swig if no scripting language is specified. --- config/gr_swig.m4 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/gr_swig.m4 b/config/gr_swig.m4 index 826661f53..8a9c73268 100644 --- a/config/gr_swig.m4 +++ b/config/gr_swig.m4 @@ -26,7 +26,8 @@ dnl # is greater or equal to the value of the argument. It should have the format: # N[.N[.N]] (N is a number between 0 and 999. Only the first N is mandatory.) AC_DEFUN([SWIG_PROG],[ - AC_REQUIRE([AC_PROG_MAKE_SET]) + AC_REQUIRE([AC_PROG_MAKE_SET]) + if test x${enable_python} = xyes -o x${enable_guile} = xyes; then AC_CHECK_PROG(SWIG,swig,[`which swig`]) if test -z "$SWIG" ; then AC_MSG_ERROR([Cannot find 'swig' program. SWIG version >= $1 required]) @@ -48,6 +49,7 @@ AC_DEFUN([SWIG_PROG],[ AC_MSG_ERROR([cannot determine SWIG version]) fi fi + fi ]) # SWIG_ENABLE_CXX() @@ -56,9 +58,11 @@ AC_DEFUN([SWIG_PROG],[ AC_DEFUN([SWIG_ENABLE_CXX],[ AC_REQUIRE([SWIG_PROG]) AC_REQUIRE([AC_PROG_CXX]) - if test "$SWIG" != "false" ; then + if test x${enable_python} = xyes -o x${enable_guile} = xyes; then + if test "$SWIG" != "false" ; then SWIG="$SWIG -c++" - fi + fi + fi ]) # SWIG_PYTHON([use-shadow-classes]) -- cgit From ff62557a42b6ce89a711f9d0603c0fe52a891ed8 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sun, 21 Nov 2010 16:01:48 -0800 Subject: Make Guile bindings work with --with-gnuradio-core et al. --- config/grc_build.m4 | 1 + config/grc_gnuradio_core.m4 | 2 ++ 2 files changed, 3 insertions(+) (limited to 'config') diff --git a/config/grc_build.m4 b/config/grc_build.m4 index 77b59db6b..121c4feb6 100644 --- a/config/grc_build.m4 +++ b/config/grc_build.m4 @@ -259,6 +259,7 @@ AC_DEFUN([_GRC_BUILD_CONDITIONAL],[ GRC_ADD_TO_LIST($3, PYDIRPATH, ":") GRC_ADD_TO_LIST($3, SWIGDIRPATH, ":") GRC_ADD_TO_LIST($3, LIBDIRPATH, ":") + GRC_ADD_TO_LIST($3, GUILE_LOAD_PATH, ":") AC_MSG_RESULT([Component $1 will be included from a pre-installed library and includes.]) $3[_with]=yes else diff --git a/config/grc_gnuradio_core.m4 b/config/grc_gnuradio_core.m4 index 8cbba49ef..ff3df8c60 100644 --- a/config/grc_gnuradio_core.m4 +++ b/config/grc_gnuradio_core.m4 @@ -26,6 +26,8 @@ AC_DEFUN([GRC_GNURADIO_CORE],[ gnuradio_core_I="$gnuradio_core_SWIGDIRPATH/gnuradio.i" gnuradio_core_SWIG_INCLUDES="-I$gnuradio_core_SWIGDIRPATH" gnuradio_core_PYDIRPATH=$pythondir + gnuradio_core_GUILE_LOAD_PATH="`pkg-config --variable=guile_load_path gnuradio-core`" + gnuradio_core_LIBDIRPATH="`pkg-config --variable=libdir gnuradio-core`" ]) dnl Don't do gnuradio-core if gruel skipped -- cgit From 77018d201be9cc58af1ae21cd9d45038e3bbfcc0 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sun, 21 Nov 2010 22:59:14 -0800 Subject: Add missing - --- config/gr_guile.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/gr_guile.m4 b/config/gr_guile.m4 index 90d4dfe9d..1f0793944 100644 --- a/config/gr_guile.m4 +++ b/config/gr_guile.m4 @@ -37,7 +37,7 @@ AC_DEFUN([GUILE_DEVEL],[ else GUILE_CFLAGS="" GUILE_PKLIBDIR="" - GUILE_LIBS="Wl,-Bsymbolic-functions -lguile lgmp -lcrypt" + GUILE_LIBS="Wl,-Bsymbolic-functions -lguile -lgmp -lcrypt" fi AC_SUBST(GUILE_CFLAGS) AC_SUBST(GUILE_PKLIBDIR) -- cgit From 9e8c1f6d60317ee3b3aa5663055f444ef593f8c3 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 22 Nov 2010 10:36:46 -0700 Subject: we don't want tcl support for now --- config/gr_scripting.m4 | 3 --- 1 file changed, 3 deletions(-) (limited to 'config') diff --git a/config/gr_scripting.m4 b/config/gr_scripting.m4 index 001f3b7e3..866b7e017 100644 --- a/config/gr_scripting.m4 +++ b/config/gr_scripting.m4 @@ -32,9 +32,6 @@ AC_DEFUN([GR_SCRIPTING],[ if test x${enable_python} = xyes; then SWIG_PYTHON fi - if test x${enable_tcl} = xyes; then - SWIG_TCL - fi if test x${enable_guile} = xyes; then SWIG_GUILE fi -- cgit From 48b0ffce87631d115bc363b21c4bf466f1bc6ae9 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 22 Nov 2010 10:37:16 -0700 Subject: always look for swig --- config/gr_swig.m4 | 2 -- 1 file changed, 2 deletions(-) (limited to 'config') diff --git a/config/gr_swig.m4 b/config/gr_swig.m4 index 8a9c73268..e03390994 100644 --- a/config/gr_swig.m4 +++ b/config/gr_swig.m4 @@ -27,7 +27,6 @@ dnl # N[.N[.N]] (N is a number between 0 and 999. Only the first N is mandatory.) AC_DEFUN([SWIG_PROG],[ AC_REQUIRE([AC_PROG_MAKE_SET]) - if test x${enable_python} = xyes -o x${enable_guile} = xyes; then AC_CHECK_PROG(SWIG,swig,[`which swig`]) if test -z "$SWIG" ; then AC_MSG_ERROR([Cannot find 'swig' program. SWIG version >= $1 required]) @@ -49,7 +48,6 @@ AC_DEFUN([SWIG_PROG],[ AC_MSG_ERROR([cannot determine SWIG version]) fi fi - fi ]) # SWIG_ENABLE_CXX() -- cgit From a2b60c309aaa65adbf149e51e6b13c29b22fa8a4 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Fri, 19 Nov 2010 11:33:27 -0800 Subject: uhd: do version check for API compat number --- config/grc_gr_uhd.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4 index 090187c04..98ab5d2e5 100644 --- a/config/grc_gr_uhd.m4 +++ b/config/grc_gr_uhd.m4 @@ -26,8 +26,8 @@ AC_DEFUN([GRC_GR_UHD],[ if test $passed = yes; then dnl Don't do gr-uhd if the 'uhd' package is not installed PKG_CHECK_MODULES( - [UHD], [uhd], [], - [passed=no; AC_MSG_RESULT([gr-uhd requires libuhd])] + [UHD], [uhd >= 1.0.0 uhd < 2.0.0], [], + [passed=no; AC_MSG_RESULT([gr-uhd requires libuhd 1.x.x])] ) AC_SUBST(UHD_CFLAGS) AC_SUBST(UHD_LIBS) -- cgit From a213cbed474164ed31a26fd4dbdbe3f13c293b6e Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Tue, 23 Nov 2010 21:44:15 -0800 Subject: Enable guile test for trellis --- config/grc_gr_trellis.m4 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/grc_gr_trellis.m4 b/config/grc_gr_trellis.m4 index cb51325d6..bc9ca6f49 100644 --- a/config/grc_gr_trellis.m4 +++ b/config/grc_gr_trellis.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2010 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -29,6 +29,7 @@ AC_DEFUN([GRC_GR_TRELLIS],[ gr-trellis/doc/Makefile \ gr-trellis/src/Makefile \ gr-trellis/src/lib/Makefile \ + gr-trellis/src/lib/run_guile_tests \ gr-trellis/src/python/Makefile \ gr-trellis/src/python/run_tests \ gr-trellis/src/examples/Makefile \ @@ -37,6 +38,8 @@ AC_DEFUN([GRC_GR_TRELLIS],[ GRC_BUILD_CONDITIONAL(gr-trellis,[ dnl run_tests is created from run_tests.in. Make it executable. - AC_CONFIG_COMMANDS([run_tests_gr_trellis], [chmod +x gr-trellis/src/python/run_tests]) + AC_CONFIG_COMMANDS([run_tests_gr_trellis], + [chmod +x gr-trellis/src/python/run_tests; + chmod +x gr-trellis/src/lib/run_guile_tests]) ]) ]) -- cgit From 64bdee166b0d852992873f7d37906d4c61a94b94 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Wed, 24 Nov 2010 00:06:15 -0800 Subject: Confirm we can load guile usrp module --- config/grc_gr_usrp.m4 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/grc_gr_usrp.m4 b/config/grc_gr_usrp.m4 index 1f2cd1ac7..b850f0050 100644 --- a/config/grc_gr_usrp.m4 +++ b/config/grc_gr_usrp.m4 @@ -29,11 +29,14 @@ AC_DEFUN([GRC_GR_USRP],[ gr-usrp/gnuradio-usrp.pc \ gr-usrp/src/Makefile \ gr-usrp/src/run_tests \ + gr-usrp/src/run_guile_tests \ gr-usrp/apps/Makefile \ ]) 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]) + AC_CONFIG_COMMANDS([run_tests_usrp], + [chmod +x gr-usrp/src/run_tests + chmod +x gr-usrp/src/run_guile_tests]) ]) ]) -- cgit From cec8dfd8d0331566c93abb69ca02913011ad2a91 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Wed, 24 Nov 2010 00:20:02 -0800 Subject: Confirm we can load guile pager module --- config/grc_gr_pager.m4 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/grc_gr_pager.m4 b/config/grc_gr_pager.m4 index cdd6177af..5330fce3a 100644 --- a/config/grc_gr_pager.m4 +++ b/config/grc_gr_pager.m4 @@ -32,10 +32,13 @@ AC_DEFUN([GRC_GR_PAGER],[ gr-pager/python/Makefile \ gr-pager/python/run_tests \ gr-pager/swig/Makefile \ + gr-pager/swig/run_guile_tests \ ]) GRC_BUILD_CONDITIONAL(gr-pager,[ dnl run_tests is created from run_tests.in. Make it executable. - AC_CONFIG_COMMANDS([run_tests_pager], [chmod +x gr-pager/python/run_tests]) + AC_CONFIG_COMMANDS([run_tests_pager], + [chmod +x gr-pager/python/run_tests + chmod +x gr-pager/swig/run_guile_tests]) ]) ]) -- cgit From 53fb7289b46ee4299a0341d9e02dad74483940b6 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Wed, 24 Nov 2010 00:31:35 -0800 Subject: Confirm we can load guile noaa module --- config/grc_gr_noaa.m4 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/grc_gr_noaa.m4 b/config/grc_gr_noaa.m4 index 69d0aad55..54df77503 100644 --- a/config/grc_gr_noaa.m4 +++ b/config/grc_gr_noaa.m4 @@ -33,10 +33,13 @@ AC_DEFUN([GRC_GR_NOAA],[ gr-noaa/oct/Makefile \ gr-noaa/python/Makefile \ gr-noaa/swig/Makefile \ + gr-noaa/swig/run_guile_tests \ ]) GRC_BUILD_CONDITIONAL(gr-noaa,[ dnl run_tests is created from run_tests.in. Make it executable. - #AC_CONFIG_COMMANDS([run_tests_noaa], [chmod +x gr-pager/lib/run_tests]) + AC_CONFIG_COMMANDS([run_tests_noaa], + [chmod +x gr-noaa/swig/run_guile_tests]) + ]) ]) -- cgit From d692a41f98e7b888c745efbb9fcbbb0400f39025 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Wed, 24 Nov 2010 17:29:11 -0800 Subject: Major Makefile.am housecleaning. Passes distcheck. Move all occurrences of swig_built_sources out of Makefile.am's. Move all SWIG related use of BUILT_SOURCES out of Makefile.am's. Clean up 'if PYTHON' conditionalization in gr-* Still left to do: fix Makefile.swig CLEANFILES and no_dist_files such that they remove exactly the generated files. --- config/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/Makefile.am b/config/Makefile.am index f5f478cff..6e8f81987 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -109,4 +109,4 @@ m4macros = \ usrp_libusb.m4 \ usrp_sdcc.m4 -EXTRA_DIST = $(m4macros) +EXTRA_DIST += $(m4macros) -- cgit From 775bd35cde0b42f3aaab76f4014e5915783ecb44 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 30 Nov 2010 12:08:16 -0500 Subject: uhd: added libdir to UHD CFLAGS (shared by lib and swig) --- config/grc_gr_uhd.m4 | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4 index 98ab5d2e5..4de905ad0 100644 --- a/config/grc_gr_uhd.m4 +++ b/config/grc_gr_uhd.m4 @@ -29,6 +29,7 @@ AC_DEFUN([GRC_GR_UHD],[ [UHD], [uhd >= 1.0.0 uhd < 2.0.0], [], [passed=no; AC_MSG_RESULT([gr-uhd requires libuhd 1.x.x])] ) + UHD_CFLAGS="${UHD_CFLAGS} -I\${abs_top_srcdir}/gr-uhd/lib" AC_SUBST(UHD_CFLAGS) AC_SUBST(UHD_LIBS) fi -- cgit From 7d8f756d11189d9378a1bbeb921baabc9c0bf643 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 1 Dec 2010 15:31:41 -0500 Subject: uhd: replaced CFLAGS with CPPFLAGS variable, and fixed swig args FIXME --- config/grc_gr_uhd.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4 index 4de905ad0..00892867d 100644 --- a/config/grc_gr_uhd.m4 +++ b/config/grc_gr_uhd.m4 @@ -29,8 +29,8 @@ AC_DEFUN([GRC_GR_UHD],[ [UHD], [uhd >= 1.0.0 uhd < 2.0.0], [], [passed=no; AC_MSG_RESULT([gr-uhd requires libuhd 1.x.x])] ) - UHD_CFLAGS="${UHD_CFLAGS} -I\${abs_top_srcdir}/gr-uhd/lib" - AC_SUBST(UHD_CFLAGS) + UHD_CPPFLAGS="${UHD_CPPFLAGS} -I\${abs_top_srcdir}/gr-uhd/lib" + AC_SUBST(UHD_CPPFLAGS) AC_SUBST(UHD_LIBS) fi -- cgit From cef9e8f38edb3f6aaea811fa04cfeebdbf26ba59 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Thu, 2 Dec 2010 21:21:41 -0800 Subject: Moved contents of gr-guile into gnuradio-core/src/guile and removed gr-guile. Passes distcheck. --- config/Makefile.am | 1 - config/grc_gnuradio_core.m4 | 3 +++ config/grc_gr_guile.m4 | 36 ------------------------------------ 3 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 config/grc_gr_guile.m4 (limited to 'config') diff --git a/config/Makefile.am b/config/Makefile.am index 6e8f81987..e525ccf36 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -61,7 +61,6 @@ m4macros = \ grc_gr_gcell.m4 \ grc_gr_gpio.m4 \ grc_gr_gsm_fr_vocoder.m4 \ - grc_gr_guile.m4 \ grc_gr_noaa.m4 \ grc_gr_radar_mono.m4 \ grc_gr_radio_astronomy.m4 \ diff --git a/config/grc_gnuradio_core.m4 b/config/grc_gnuradio_core.m4 index ff3df8c60..e60bdac59 100644 --- a/config/grc_gnuradio_core.m4 +++ b/config/grc_gnuradio_core.m4 @@ -85,6 +85,8 @@ AC_DEFUN([GRC_GNURADIO_CORE],[ gnuradio-core/src/gen_interpolator_taps/Makefile \ gnuradio-core/src/guile/Makefile \ gnuradio-core/src/guile/run_guile_tests \ + gnuradio-core/src/guile/gnuradio/scripts/gr-run-waveform \ + gnuradio-core/src/guile/example-waveforms/Makefile \ gnuradio-core/src/lib/Makefile \ gnuradio-core/src/lib/filter/Makefile \ gnuradio-core/src/lib/g72x/Makefile \ @@ -118,6 +120,7 @@ AC_DEFUN([GRC_GNURADIO_CORE],[ [ chmod +x gnuradio-core/src/python/gnuradio/gr/run_tests chmod +x gnuradio-core/src/guile/run_guile_tests + chmod +x gnuradio-core/src/guile/gnuradio/scripts/gr-run-waveform ]) ]) ]) diff --git a/config/grc_gr_guile.m4 b/config/grc_gr_guile.m4 deleted file mode 100644 index 35d6834eb..000000000 --- a/config/grc_gr_guile.m4 +++ /dev/null @@ -1,36 +0,0 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2009,2010 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_GUILE],[ - GRC_ENABLE(gr-guile) - - dnl Don't do gr-guile if gnuradio-core skipped - GRC_CHECK_DEPENDENCY(gr-guile, gnuradio-core) - - AC_CONFIG_FILES([ \ - gr-guile/Makefile \ - gr-guile/apps/Makefile \ - gr-guile/example-waveforms/Makefile \ - ]) - - GRC_BUILD_CONDITIONAL(gr-guile,[ - dnl run_tests is created from run_tests.in. Make it executable. - dnl AC_CONFIG_COMMANDS([run_tests_guile], [chmod +x gr-guile/apps/run_guile_tests]) - ]) -]) -- cgit From 5d92ead4644527b67bc8b94c9b12e7f085089fbe Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sat, 4 Dec 2010 00:45:31 -0800 Subject: Copy fix from gr-howto-write-a-block/config/gr_swig.m4 to main --- config/gr_swig.m4 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'config') diff --git a/config/gr_swig.m4 b/config/gr_swig.m4 index e03390994..dcc2e72dc 100644 --- a/config/gr_swig.m4 +++ b/config/gr_swig.m4 @@ -56,10 +56,8 @@ AC_DEFUN([SWIG_PROG],[ AC_DEFUN([SWIG_ENABLE_CXX],[ AC_REQUIRE([SWIG_PROG]) AC_REQUIRE([AC_PROG_CXX]) - if test x${enable_python} = xyes -o x${enable_guile} = xyes; then - if test "$SWIG" != "false" ; then + if test "$SWIG" != "false" ; then SWIG="$SWIG -c++" - fi fi ]) -- cgit From 97a15322fbff109badfcca680bc860d508176bee Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Mon, 6 Dec 2010 20:02:11 -0800 Subject: Remove copy of config/gr_standalone.m4 from top/config --- config/Makefile.am | 1 - config/gr_standalone.m4 | 116 ------------------------------------------------ 2 files changed, 117 deletions(-) delete mode 100644 config/gr_standalone.m4 (limited to 'config') diff --git a/config/Makefile.am b/config/Makefile.am index e525ccf36..68ff3c78c 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -90,7 +90,6 @@ m4macros = \ gr_require_mc4020.m4 \ gr_scripting.m4 \ gr_set_md_cpu.m4 \ - gr_standalone.m4 \ gr_subversion.m4 \ gr_swig.m4 \ gr_sysv_shm.m4 \ diff --git a/config/gr_standalone.m4 b/config/gr_standalone.m4 deleted file mode 100644 index 370f7fb03..000000000 --- a/config/gr_standalone.m4 +++ /dev/null @@ -1,116 +0,0 @@ -dnl -dnl Copyright 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 along -dnl with this program; if not, write to the Free Software Foundation, Inc., -dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -dnl - -dnl -dnl GR_STANDALONE([package],[version]) -dnl -dnl Handles the bulk of the configure.ac work for an out-of-tree build -dnl -dnl N.B., this is an m4_define because if it were an AC_DEFUN it would -dnl get called too late to be useful. - -m4_define([GR_STANDALONE], -[ - AC_INIT([$1],[$2]) - AC_PREREQ(2.57) - AC_CONFIG_SRCDIR([config/gr_standalone.m4]) - AC_CONFIG_AUX_DIR([.]) - AM_CONFIG_HEADER(config.h) - - AC_CANONICAL_BUILD - AC_CANONICAL_HOST - AC_CANONICAL_TARGET - - AM_INIT_AUTOMAKE - - LF_CONFIGURE_CC - LF_CONFIGURE_CXX - GR_LIB64 dnl check for lib64 suffix after choosing compilers - - dnl add ${prefix}/lib${gr_libdir_suffix}/pkgconfig to the head of the PKG_CONFIG_PATH - if test x${PKG_CONFIG_PATH} = x; then - PKG_CONFIG_PATH=${prefix}/lib${gr_libdir_suffix}/pkgconfig - else - PKG_CONFIG_PATH=${prefix}/lib${gr_libdir_suffix}/pkgconfig:${PKG_CONFIG_PATH} - fi - export PKG_CONFIG_PATH - - LF_SET_WARNINGS - GR_SET_GPROF - GR_SET_PROF - AM_PROG_AS - AC_PROG_LN_S - AC_PROG_MAKE_SET - AC_PROG_INSTALL - AC_PATH_PROG([RM_PROG], [rm]) - - AC_LIBTOOL_WIN32_DLL - AC_ENABLE_SHARED dnl do build shared libraries - AC_DISABLE_STATIC dnl don't build static libraries - m4_ifdef([LT_INIT],[LT_INIT],[AC_PROG_LIBTOOL]) - dnl GR_FORTRAN - - GR_NO_UNDEFINED dnl do we need the -no-undefined linker flag - GR_SCRIPTING dnl Locate python, SWIG, etc - - AC_ARG_WITH([python], - AC_HELP_STRING([--with-python], [Should we use python? [[default=yes]]]), - [case "$with_python" in - (no | yes) ;; - (*) AC_MSG_ERROR([Invalid argument ($with_python) to --with-python]) ;; - esac], - [with_python=yes]) - - AM_CONDITIONAL([USE_PYTHON], [test "$with_python" = yes]) - - - dnl Set the c++ compiler that we use for the build system when cross compiling - if test "x$CXX_FOR_BUILD" = x - then - CXX_FOR_BUILD=${CXX} - fi - AC_SUBST(CXX_FOR_BUILD) - - dnl Checks for header files. - AC_HEADER_STDC - - dnl Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST - AC_C_INLINE - AC_TYPE_SIZE_T - AC_HEADER_TIME - AC_C_BIGENDIAN - - dnl Check for Mingw support - GR_PWIN32 - - AC_CHECK_PROG([XMLTO],[xmlto],[yes],[]) - AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes]) - - dnl Define where to look for cppunit includes and libs - dnl sets CPPUNIT_CFLAGS and CPPUNIT_LIBS - dnl Try using pkg-config first, then fall back to cppunit-config. - PKG_CHECK_EXISTS(cppunit, - [PKG_CHECK_MODULES(CPPUNIT, cppunit >= 1.9.14)], - [AM_PATH_CPPUNIT([1.9.14],[], - [AC_MSG_ERROR([GNU Radio requires cppunit. Stop])])]) - - PKG_CHECK_MODULES(GNURADIO_CORE, gnuradio-core >= 3) -]) -- cgit From 9552f6f1e1035c6973e1b7be40c2c3a8b4cf5b7d Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Tue, 7 Dec 2010 11:08:50 -0700 Subject: flag an error if --enable-guile is specified, but guile-dev is not --- config/gr_guile.m4 | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/gr_guile.m4 b/config/gr_guile.m4 index 1f0793944..15ed9adb3 100644 --- a/config/gr_guile.m4 +++ b/config/gr_guile.m4 @@ -35,6 +35,7 @@ AC_DEFUN([GUILE_DEVEL],[ GUILE_PKLIBDIR="`${GUILE_CONFIG} info pkglibdir`" GUILE_PKDATADIR="`${GUILE_CONFIG} info pkgdatadir`/site" else + AC_MSG_ERROR([You need to install libguile-dev!]) GUILE_CFLAGS="" GUILE_PKLIBDIR="" GUILE_LIBS="Wl,-Bsymbolic-functions -lguile -lgmp -lcrypt" -- cgit From c6d4c7d5b410d066e55a31c787476a9ac96b1277 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Tue, 7 Dec 2010 15:54:27 -0800 Subject: Moved out-of-tree includes out of gnuradio_core_INCLUDES to ensure that in-tree includes are searched before out-of-tree includes. --- config/grc_gnuradio_core.m4 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'config') diff --git a/config/grc_gnuradio_core.m4 b/config/grc_gnuradio_core.m4 index e60bdac59..4585b9ace 100644 --- a/config/grc_gnuradio_core.m4 +++ b/config/grc_gnuradio_core.m4 @@ -63,9 +63,7 @@ AC_DEFUN([GRC_GNURADIO_CORE],[ -I\${abs_top_srcdir}/gnuradio-core/src/lib/g72x \ -I\${abs_top_srcdir}/gnuradio-core/src/lib/swig \ -I\${abs_top_srcdir}/gnuradio-core/src/lib/hier \ --I\${abs_top_builddir}/gnuradio-core/src/lib/swig \ -\$(FFTW3F_CFLAGS) \ -\$(GSL_CFLAGS)" +-I\${abs_top_builddir}/gnuradio-core/src/lib/swig" gnuradio_core_LA="\${abs_top_builddir}/gnuradio-core/src/lib/libgnuradio-core.la" dnl gnuradio_core_I="\${abs_top_srcdir}/gnuradio-core/src/lib/swig/gnuradio.i" gnuradio_core_LIBDIRPATH="\${abs_top_builddir}/gnuradio-core/src/lib:\${abs_top_builddir}/gnuradio-core/src/lib/.libs" -- cgit From 1186ab980d1e1fe36ff869097fd0697dd41ff7ae Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Wed, 8 Dec 2010 00:59:23 -0500 Subject: volk: Updating build system so that volk configures and builds from gnuradio top level dir. --- config/grc_volk.m4 | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 config/grc_volk.m4 (limited to 'config') diff --git a/config/grc_volk.m4 b/config/grc_volk.m4 new file mode 100644 index 000000000..ea9ca9101 --- /dev/null +++ b/config/grc_volk.m4 @@ -0,0 +1,45 @@ +dnl Copyright 2010 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_VOLK],[ + GRC_ENABLE(volk) + GRC_WITH(volk) + + dnl volk uses a subsidiary configure.ac + AC_CONFIG_SUBDIRS([volk]) + + GRC_CHECK_DEPENDENCY(volk, gruel) + + 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 != with; then + dnl how and where to find INCLUDES and LA + VOLK_INCLUDES="-I\${abs_top_srcdir}/include" + VOLK_LA="\${abs_top_builddir}/volk/lib/libvolk.la \ + ${abs_top_builddir}/volk/lib/libvolk_runtime.la" + fi + + dnl Include the volk INCLUDES and LA + AC_SUBST(VOLK_INCLUDES) + AC_SUBST(VOLK_LA) + + GRC_BUILD_CONDITIONAL(volk, []) +]) -- cgit From a72fa7a12cad5b32f06709c8939a4fb054679ca6 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Thu, 9 Dec 2010 12:12:47 -0500 Subject: volk: Small fixes to M4 file for better project integration. --- config/grc_volk.m4 | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'config') diff --git a/config/grc_volk.m4 b/config/grc_volk.m4 index ea9ca9101..1b3c54dd7 100644 --- a/config/grc_volk.m4 +++ b/config/grc_volk.m4 @@ -24,22 +24,16 @@ AC_DEFUN([GRC_VOLK],[ dnl volk uses a subsidiary configure.ac AC_CONFIG_SUBDIRS([volk]) - GRC_CHECK_DEPENDENCY(volk, gruel) - 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 != with; then - dnl how and where to find INCLUDES and LA - VOLK_INCLUDES="-I\${abs_top_srcdir}/include" - VOLK_LA="\${abs_top_builddir}/volk/lib/libvolk.la \ - ${abs_top_builddir}/volk/lib/libvolk_runtime.la" + dnl how and where to find INCLUDES and LA + volk_INCLUDES="-I\${abs_top_srcdir}/volk/include" + volk_LA="\${abs_top_builddir}/volk/lib/libvolk.la \ + \${abs_top_builddir}/volk/lib/libvolk_runtime.la" fi - dnl Include the volk INCLUDES and LA - AC_SUBST(VOLK_INCLUDES) - AC_SUBST(VOLK_LA) - GRC_BUILD_CONDITIONAL(volk, []) ]) -- cgit From 1047775464c1bb8a86e727487551e2b14abd476e Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Mon, 13 Dec 2010 12:21:35 -0500 Subject: gr_uhd: Quick fix for make distcheck failures if UHD is not installed. --- config/grc_gr_uhd.m4 | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'config') diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4 index 00892867d..a9404425a 100644 --- a/config/grc_gr_uhd.m4 +++ b/config/grc_gr_uhd.m4 @@ -32,6 +32,10 @@ AC_DEFUN([GRC_GR_UHD],[ UHD_CPPFLAGS="${UHD_CPPFLAGS} -I\${abs_top_srcdir}/gr-uhd/lib" AC_SUBST(UHD_CPPFLAGS) AC_SUBST(UHD_LIBS) + + # Use this to tell the Makefile whether to define + # GR_HAVE_UHD for swig. + AM_CONDITIONAL([GR_DEFINE_HAVE_UHD],[test $passed = yes]) fi AC_CONFIG_FILES([ \ -- cgit From 272971a25cbd777634331a8777d2fbab2bb10ab7 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Wed, 22 Dec 2010 16:49:05 -0800 Subject: Check for lt_dladvise_global and fall back to using lt_dlopenext if not found. --- config/gr_guile.m4 | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'config') diff --git a/config/gr_guile.m4 b/config/gr_guile.m4 index 15ed9adb3..c5268169f 100644 --- a/config/gr_guile.m4 +++ b/config/gr_guile.m4 @@ -44,6 +44,12 @@ AC_DEFUN([GUILE_DEVEL],[ AC_SUBST(GUILE_PKLIBDIR) AC_SUBST(GUILE_PKDATADIR) AC_SUBST(GUILE_LIBS) + + dnl see if we've got lt_dladvise_global (libtool-2.*) + AC_SEARCH_LIBS([lt_dladvise_global],[ltdl], + [AC_DEFINE([HAVE_LT_DLADVISE_GLOBAL], [1], + [Define if lt_dladvise_global exists.])], + [],[]) ]) # GUILE_CHECK_MODULE -- cgit From f290f9e4f1a9b9ca09ef95269d563cd785b08a61 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Mon, 27 Dec 2010 18:46:54 -0800 Subject: Add minimal guile test code gr-usrp2. --- config/grc_gr_usrp2.m4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/grc_gr_usrp2.m4 b/config/grc_gr_usrp2.m4 index 4cac5ca08..5a9bb3b70 100644 --- a/config/grc_gr_usrp2.m4 +++ b/config/grc_gr_usrp2.m4 @@ -29,10 +29,12 @@ AC_DEFUN([GRC_GR_USRP2],[ gr-usrp2/gnuradio-usrp2.pc \ gr-usrp2/src/Makefile \ gr-usrp2/src/run_tests \ + gr-usrp2/src/run_guile_tests \ ]) GRC_BUILD_CONDITIONAL(gr-usrp2,[ dnl run_tests is created from run_tests.in. Make it executable. - AC_CONFIG_COMMANDS([run_tests_usrp2], [chmod +x gr-usrp2/src/run_tests]) + AC_CONFIG_COMMANDS([run_tests_usrp2], + [chmod +x gr-usrp2/src/run_tests gr-usrp2/src/run_guile_tests]) ]) ]) -- cgit From b8f174ce7eae1cfe8deda0353da4557a238730c9 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Mon, 27 Dec 2010 22:37:30 -0800 Subject: Add minimal Python and Guile QA code to gr-uhd. --- config/grc_gr_uhd.m4 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4 index a9404425a..80052bb50 100644 --- a/config/grc_gr_uhd.m4 +++ b/config/grc_gr_uhd.m4 @@ -44,7 +44,13 @@ AC_DEFUN([GRC_GR_UHD],[ gr-uhd/grc/Makefile \ gr-uhd/lib/Makefile \ gr-uhd/swig/Makefile \ + gr-uhd/swig/run_tests \ + gr-uhd/swig/run_guile_tests \ ]) - GRC_BUILD_CONDITIONAL(gr-uhd) + GRC_BUILD_CONDITIONAL(gr-uhd,[ + dnl run_tests is created from run_tests.in. Make it executable. + AC_CONFIG_COMMANDS([run_tests_uhd], + [chmod +x gr-uhd/swig/run_tests gr-uhd/swig/run_guile_tests]) + ]) ]) -- cgit From 8e44bd38fc29748d4fac69d67a9db59af93060e8 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Thu, 30 Dec 2010 11:00:07 -0500 Subject: More generic error message if guile-dev not installed. --- config/gr_guile.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/gr_guile.m4 b/config/gr_guile.m4 index c5268169f..4d8d61d43 100644 --- a/config/gr_guile.m4 +++ b/config/gr_guile.m4 @@ -35,7 +35,7 @@ AC_DEFUN([GUILE_DEVEL],[ GUILE_PKLIBDIR="`${GUILE_CONFIG} info pkglibdir`" GUILE_PKDATADIR="`${GUILE_CONFIG} info pkgdatadir`/site" else - AC_MSG_ERROR([You need to install libguile-dev!]) + AC_MSG_ERROR([You need to install the guile development files (e.g., libguile-dev, guile-devel, etc.)!]) GUILE_CFLAGS="" GUILE_PKLIBDIR="" GUILE_LIBS="Wl,-Bsymbolic-functions -lguile -lgmp -lcrypt" -- cgit From 16416305bf6dc7879b81c6b86568a5597d8d5ab0 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Thu, 30 Dec 2010 13:50:11 -0800 Subject: Create and install gr-run-waveform-script, and symlink to it when installed. --- config/grc_gnuradio_core.m4 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'config') diff --git a/config/grc_gnuradio_core.m4 b/config/grc_gnuradio_core.m4 index 4585b9ace..4ee888281 100644 --- a/config/grc_gnuradio_core.m4 +++ b/config/grc_gnuradio_core.m4 @@ -83,7 +83,7 @@ AC_DEFUN([GRC_GNURADIO_CORE],[ gnuradio-core/src/gen_interpolator_taps/Makefile \ gnuradio-core/src/guile/Makefile \ gnuradio-core/src/guile/run_guile_tests \ - gnuradio-core/src/guile/gnuradio/scripts/gr-run-waveform \ + gnuradio-core/src/guile/gr-run-waveform-script \ gnuradio-core/src/guile/example-waveforms/Makefile \ gnuradio-core/src/lib/Makefile \ gnuradio-core/src/lib/filter/Makefile \ @@ -118,7 +118,6 @@ AC_DEFUN([GRC_GNURADIO_CORE],[ [ chmod +x gnuradio-core/src/python/gnuradio/gr/run_tests chmod +x gnuradio-core/src/guile/run_guile_tests - chmod +x gnuradio-core/src/guile/gnuradio/scripts/gr-run-waveform ]) ]) ]) -- cgit From 9739742f0b90968a8aaf0f5c2e24f9bbadda5e80 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Thu, 30 Dec 2010 14:10:00 -0800 Subject: Move example waveforms to gnuradio-examples/waveforms. --- config/grc_gnuradio_core.m4 | 1 - config/grc_gnuradio_examples.m4 | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/grc_gnuradio_core.m4 b/config/grc_gnuradio_core.m4 index 4ee888281..15086be0f 100644 --- a/config/grc_gnuradio_core.m4 +++ b/config/grc_gnuradio_core.m4 @@ -84,7 +84,6 @@ AC_DEFUN([GRC_GNURADIO_CORE],[ gnuradio-core/src/guile/Makefile \ gnuradio-core/src/guile/run_guile_tests \ gnuradio-core/src/guile/gr-run-waveform-script \ - gnuradio-core/src/guile/example-waveforms/Makefile \ gnuradio-core/src/lib/Makefile \ gnuradio-core/src/lib/filter/Makefile \ gnuradio-core/src/lib/g72x/Makefile \ diff --git a/config/grc_gnuradio_examples.m4 b/config/grc_gnuradio_examples.m4 index 4d6116c70..0aad0c0da 100644 --- a/config/grc_gnuradio_examples.m4 +++ b/config/grc_gnuradio_examples.m4 @@ -43,6 +43,7 @@ AC_DEFUN([GRC_GNURADIO_EXAMPLES],[ gnuradio-examples/python/pfb/Makefile \ gnuradio-examples/python/usrp/Makefile \ gnuradio-examples/python/usrp2/Makefile \ + gnuradio-examples/waveforms/Makefile \ ]) GRC_BUILD_CONDITIONAL(gnuradio-examples) -- cgit From af1634185dbeeebd912f55bd099e1fd0830407e5 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Mon, 3 Jan 2011 12:16:09 -0500 Subject: Remove wxpython dependency from gnuradio-companion. GRC does not need wxpython to run. It is only needed if you create gui based flow graphs. --- config/grc_grc.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/grc_grc.m4 b/config/grc_grc.m4 index 16720b8fe..446bba3c5 100644 --- a/config/grc_grc.m4 +++ b/config/grc_grc.m4 @@ -20,7 +20,7 @@ dnl Boston, MA 02110-1301, USA. AC_DEFUN([GRC_GRC],[ GRC_ENABLE(grc) - GRC_CHECK_DEPENDENCY(grc, gr-wxgui) +dnl GRC_CHECK_DEPENDENCY(grc, gr-wxgui) AC_CHECK_PROG(XDG_UTILS, xdg-mime, true, false) AM_CONDITIONAL(XDG_UTILS, $XDG_UTILS) -- cgit From a34dae039920afee252c05cdf37943b11fc0fcc5 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Mon, 17 Jan 2011 16:03:24 -0800 Subject: grc: numpy is also a grc dependency, check numpy when since not requiring wxgui --- config/grc_grc.m4 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'config') diff --git a/config/grc_grc.m4 b/config/grc_grc.m4 index 446bba3c5..998a0b11d 100644 --- a/config/grc_grc.m4 +++ b/config/grc_grc.m4 @@ -20,8 +20,6 @@ dnl Boston, MA 02110-1301, USA. AC_DEFUN([GRC_GRC],[ GRC_ENABLE(grc) -dnl GRC_CHECK_DEPENDENCY(grc, gr-wxgui) - AC_CHECK_PROG(XDG_UTILS, xdg-mime, true, false) AM_CONDITIONAL(XDG_UTILS, $XDG_UTILS) @@ -33,6 +31,7 @@ dnl GRC_CHECK_DEPENDENCY(grc, gr-wxgui) PYTHON_CHECK_MODULE([Cheetah],[Python Cheetah templates >= 2.0.0],[],[passed=no],[Cheetah.Version >= "2.0.0"]) PYTHON_CHECK_MODULE([lxml.etree],[Python lxml wrappers >= 1.3.6],[],[passed=no],[lxml.etree.LXML_VERSION >= (1, 3, 6, 0)]) PYTHON_CHECK_MODULE([gtk],[Python gtk wrappers >= 2.10.0],[],[passed=no],[gtk.pygtk_version >= (2, 10, 0)]) + PYTHON_CHECK_MODULE([numpy],[NumPy],[],[passed=no],[True]) fi dnl ######################################## -- cgit From 48f9ca90e0cbcbfe67b0e10889c60928d9be5c49 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Mon, 17 Jan 2011 16:37:45 -0800 Subject: gr math simplification: Replaces gr_gcd, gr_isnan, and gr_signbit one-time instances with boot math calls. No point in wrapping these utility math functions into gnuradio when they are 1) provided by boost 2) only called once Removes gr_math.cc, and configure checks for isnan. --- config/lf_cxx.m4 | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'config') diff --git a/config/lf_cxx.m4 b/config/lf_cxx.m4 index dfc6bfbfe..7cce5f8a4 100644 --- a/config/lf_cxx.m4 +++ b/config/lf_cxx.m4 @@ -46,22 +46,5 @@ AC_DEFUN([LF_CXX_PORTABILITY],[ dnl Check for common C++ portability problems dnl - dnl AC_LANG_PUSH - dnl AC_LANG_CPLUSPLUS - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - - - dnl Test whether C++ has std::isnan - AC_MSG_CHECKING(whether C++ has std::isnan) - AC_TRY_COMPILE([#include ], [ - std::isnan(0); -], [ AC_MSG_RESULT(yes) - AC_DEFINE(CXX_HAS_STD_ISNAN,[],[Define if has std::isnan]) ], - [ AC_MSG_RESULT(no) ]) - - dnl Done with the portability checks - dnl AC_LANG_POP([C++]) - AC_LANG_RESTORE ]) -- cgit From 05cc02cec03507c47846a668c92e6dcc4ba2e71e Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 18 Jan 2011 01:00:15 -0800 Subject: cleanup mkdir usage with boost filesystem: Replaced copy/pasted code and MKDIR_TAKES_ONE_ARG #ifdefs with portable boost filesystem path and directory creation. Gets the correct home directory on windows systems: APPDATA. Replaces large amounts of copypasta with single lines of code. Removes MKDIR_TAKES_ONE_ARG configuration checks from m4 files. Adds boost filesystem and system library as build dependencies. --- config/gr_pwin32.m4 | 11 ----------- config/mkstemp.m4 | 11 ----------- 2 files changed, 22 deletions(-) (limited to 'config') diff --git a/config/gr_pwin32.m4 b/config/gr_pwin32.m4 index 495e9dd4d..85a4a1633 100644 --- a/config/gr_pwin32.m4 +++ b/config/gr_pwin32.m4 @@ -61,17 +61,6 @@ AC_TRY_LINK([ #include AC_MSG_RESULT(no) ) -dnl Under Win32, mkdir prototype in io.h has only one arg -AC_MSG_CHECKING(whether mkdir accepts only one arg) -AC_TRY_COMPILE([#include - #include - #include ], [ - mkdir("") - ], [ AC_MSG_RESULT(yes) - AC_DEFINE(MKDIR_TAKES_ONE_ARG,[],[Define if mkdir accepts only one arg]) ], - [ AC_MSG_RESULT(no) - ]) - AH_BOTTOM( [ /* Define missing prototypes, implemented in replacement lib */ diff --git a/config/mkstemp.m4 b/config/mkstemp.m4 index 4af0f0a9b..2d1fbee9b 100644 --- a/config/mkstemp.m4 +++ b/config/mkstemp.m4 @@ -75,15 +75,4 @@ AC_DEFUN([jm_PREREQ_TEMPNAME], AC_CHECK_FUNCS(__secure_getenv gettimeofday lstat) AC_CHECK_DECLS_ONCE(getenv) # AC_REQUIRE([jm_AC_TYPE_UINTMAX_T]) - - dnl Under Win32, mkdir prototype in io.h has only one arg - AC_MSG_CHECKING(whether mkdir accepts only one arg) - AC_TRY_COMPILE([#include - #include - #include ], [ - mkdir("") - ], [ AC_MSG_RESULT(yes) - AC_DEFINE(MKDIR_TAKES_ONE_ARG,[],[Define if mkdir accepts only one arg]) ], - [ AC_MSG_RESULT(no) - ]) ]) -- cgit From 5a671f0b925e0a4f57344225514147cc0dc4a5d8 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 5 Jan 2011 13:27:01 -0800 Subject: uhd: increment api compat number --- config/grc_gr_uhd.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4 index 80052bb50..e94747c1a 100644 --- a/config/grc_gr_uhd.m4 +++ b/config/grc_gr_uhd.m4 @@ -26,8 +26,8 @@ AC_DEFUN([GRC_GR_UHD],[ if test $passed = yes; then dnl Don't do gr-uhd if the 'uhd' package is not installed PKG_CHECK_MODULES( - [UHD], [uhd >= 1.0.0 uhd < 2.0.0], [], - [passed=no; AC_MSG_RESULT([gr-uhd requires libuhd 1.x.x])] + [UHD], [uhd >= 2.0.0 uhd < 3.0.0], [], + [passed=no; AC_MSG_RESULT([gr-uhd requires libuhd 2.x.x])] ) UHD_CPPFLAGS="${UHD_CPPFLAGS} -I\${abs_top_srcdir}/gr-uhd/lib" AC_SUBST(UHD_CPPFLAGS) -- cgit From 16d98959849ae93a062d03f130a6f86ce22996a1 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sat, 22 Jan 2011 14:07:04 -0500 Subject: Updating copyright. --- config/grc_grc.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/grc_grc.m4 b/config/grc_grc.m4 index 998a0b11d..c21acccff 100644 --- a/config/grc_grc.m4 +++ b/config/grc_grc.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2008, 2009 Free Software Foundation, Inc. +dnl Copyright 2008, 2009, 2011 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl -- cgit From ebb0f56da62e9ff16928b32cc525f24c93a99e0b Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sat, 22 Jan 2011 14:54:20 -0500 Subject: Updating copyright. --- config/gr_pwin32.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/gr_pwin32.m4 b/config/gr_pwin32.m4 index 85a4a1633..6b27b439f 100644 --- a/config/gr_pwin32.m4 +++ b/config/gr_pwin32.m4 @@ -1,6 +1,6 @@ # Check for (mingw)win32 POSIX replacements. -*- Autoconf -*- -# Copyright 2003,2004,2005 Free Software Foundation, Inc. +# Copyright 2003,2004,2005,2011 Free Software Foundation, Inc. # # This file is part of GNU Radio # -- cgit From cb35c3e28f277717d8f9f849636768d57720487f Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 2 Feb 2011 19:40:16 -0800 Subject: gruel: generate pmt_serial_tags with python, removes guile dependency --- config/grc_gruel.m4 | 4 ---- 1 file changed, 4 deletions(-) (limited to 'config') diff --git a/config/grc_gruel.m4 b/config/grc_gruel.m4 index d8ac95fed..729571434 100644 --- a/config/grc_gruel.m4 +++ b/config/grc_gruel.m4 @@ -25,10 +25,6 @@ AC_DEFUN([GRC_GRUEL],[ 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 gruel if guile not available - GRC_CHECK_GUILE(gruel) - fi if test $passed != with; then dnl how and where to find INCLUDES and LA and such gruel_INCLUDES="\ -- cgit From 7787d1fc1aecc7b59e476c31865b4f32348cb729 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Thu, 10 Feb 2011 00:56:55 -0800 Subject: uhd: replaced multi/single usrp stuff with just one usrp wrapper --- config/grc_gr_uhd.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4 index e94747c1a..2c0c9064e 100644 --- a/config/grc_gr_uhd.m4 +++ b/config/grc_gr_uhd.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2010 Free Software Foundation, Inc. +dnl Copyright 2010-2011 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -29,7 +29,7 @@ AC_DEFUN([GRC_GR_UHD],[ [UHD], [uhd >= 2.0.0 uhd < 3.0.0], [], [passed=no; AC_MSG_RESULT([gr-uhd requires libuhd 2.x.x])] ) - UHD_CPPFLAGS="${UHD_CPPFLAGS} -I\${abs_top_srcdir}/gr-uhd/lib" + UHD_CPPFLAGS="${UHD_CPPFLAGS} -I\${abs_top_srcdir}/gr-uhd/include" AC_SUBST(UHD_CPPFLAGS) AC_SUBST(UHD_LIBS) @@ -40,8 +40,8 @@ AC_DEFUN([GRC_GR_UHD],[ AC_CONFIG_FILES([ \ gr-uhd/Makefile \ - gr-uhd/apps/Makefile \ gr-uhd/grc/Makefile \ + gr-uhd/include/Makefile \ gr-uhd/lib/Makefile \ gr-uhd/swig/Makefile \ gr-uhd/swig/run_tests \ -- cgit From e96d9617fdaf5b83e9711b924decebbefacabd15 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Thu, 10 Feb 2011 14:31:40 -0800 Subject: uhd: incremented compat number for new api support --- config/grc_gr_uhd.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4 index 2c0c9064e..030b15155 100644 --- a/config/grc_gr_uhd.m4 +++ b/config/grc_gr_uhd.m4 @@ -26,8 +26,8 @@ AC_DEFUN([GRC_GR_UHD],[ if test $passed = yes; then dnl Don't do gr-uhd if the 'uhd' package is not installed PKG_CHECK_MODULES( - [UHD], [uhd >= 2.0.0 uhd < 3.0.0], [], - [passed=no; AC_MSG_RESULT([gr-uhd requires libuhd 2.x.x])] + [UHD], [uhd >= 3.0.0 uhd < 4.0.0], [], + [passed=no; AC_MSG_RESULT([gr-uhd requires libuhd 3.x.x])] ) UHD_CPPFLAGS="${UHD_CPPFLAGS} -I\${abs_top_srcdir}/gr-uhd/include" AC_SUBST(UHD_CPPFLAGS) -- cgit From 090799813fee5305fc080297ce43cccc662c9f6e Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Thu, 17 Feb 2011 12:15:36 -0500 Subject: guile: removing calls to check for guile and guile-dev. GNU Radio can once again be built without Guile. --- config/gr_guile.m4 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/gr_guile.m4 b/config/gr_guile.m4 index 4d8d61d43..b5879e081 100644 --- a/config/gr_guile.m4 +++ b/config/gr_guile.m4 @@ -35,7 +35,11 @@ AC_DEFUN([GUILE_DEVEL],[ GUILE_PKLIBDIR="`${GUILE_CONFIG} info pkglibdir`" GUILE_PKDATADIR="`${GUILE_CONFIG} info pkgdatadir`/site" else - AC_MSG_ERROR([You need to install the guile development files (e.g., libguile-dev, guile-devel, etc.)!]) + dnl Only break on an error if we are using guile. + dnl This should be taken care of in gr_scripting.m4 and I don't know why it's not. + if test x${enable_guile} = xyes; then + AC_MSG_ERROR([You need to install the guile development files (e.g., libguile-dev, guile-devel, etc.)!]) + fi GUILE_CFLAGS="" GUILE_PKLIBDIR="" GUILE_LIBS="Wl,-Bsymbolic-functions -lguile -lgmp -lcrypt" -- cgit From 9ae8997e5f682bc16e58c0a0bba21794dbd705c5 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Mon, 6 Dec 2010 22:46:39 -0500 Subject: qtgui: created a forms module with a slider and text box, implemented in grc --- config/grc_gr_qtgui.m4 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config') diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4 index 4027bb332..6a69dd7a8 100644 --- a/config/grc_gr_qtgui.m4 +++ b/config/grc_gr_qtgui.m4 @@ -82,6 +82,8 @@ AC_DEFUN([GRC_GR_QTGUI],[ AC_CONFIG_FILES([ \ gr-qtgui/Makefile \ + gr-qtgui/grc/Makefile \ + gr-qtgui/python/Makefile \ gr-qtgui/src/Makefile \ gr-qtgui/src/lib/Makefile \ gr-qtgui/src/python/Makefile \ -- cgit From a284640decd1fd6634f35bd1e20fd69b9194a7b6 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 18 Jan 2011 22:42:48 -0800 Subject: qtgui: use pyqwt widgets in grc variable slider block --- config/grc_gr_qtgui.m4 | 2 -- config/grc_grc.m4 | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4 index 6a69dd7a8..4027bb332 100644 --- a/config/grc_gr_qtgui.m4 +++ b/config/grc_gr_qtgui.m4 @@ -82,8 +82,6 @@ AC_DEFUN([GRC_GR_QTGUI],[ AC_CONFIG_FILES([ \ gr-qtgui/Makefile \ - gr-qtgui/grc/Makefile \ - gr-qtgui/python/Makefile \ gr-qtgui/src/Makefile \ gr-qtgui/src/lib/Makefile \ gr-qtgui/src/python/Makefile \ diff --git a/config/grc_grc.m4 b/config/grc_grc.m4 index c21acccff..9aff3cd1d 100644 --- a/config/grc_grc.m4 +++ b/config/grc_grc.m4 @@ -20,6 +20,8 @@ dnl Boston, MA 02110-1301, USA. AC_DEFUN([GRC_GRC],[ GRC_ENABLE(grc) +dnl GRC_CHECK_DEPENDENCY(grc, gr-wxgui) + AC_CHECK_PROG(XDG_UTILS, xdg-mime, true, false) AM_CONDITIONAL(XDG_UTILS, $XDG_UTILS) -- cgit From e30f0a7ca02801732ad7a25ab83e1d27dc45c6ce Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Thu, 20 Jan 2011 22:31:31 -0800 Subject: grc: added tabbed widget in qtgui for grc created gui_hint type to handle tab descriptor + position markup, and to handle the generation of the name of the parent widget. No support python modules required in gr-qtgui. --- config/grc_gr_qtgui.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4 index 4027bb332..c14f984c3 100644 --- a/config/grc_gr_qtgui.m4 +++ b/config/grc_gr_qtgui.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2011 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -82,6 +82,7 @@ AC_DEFUN([GRC_GR_QTGUI],[ AC_CONFIG_FILES([ \ gr-qtgui/Makefile \ + gr-qtgui/grc/Makefile \ gr-qtgui/src/Makefile \ gr-qtgui/src/lib/Makefile \ gr-qtgui/src/python/Makefile \ -- cgit From f0537a7da4571bd6aaab273a0588eaef04121648 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Fri, 21 Jan 2011 15:20:45 -0800 Subject: grc: moved wxgui blocks and python into gr-wxgui/grc Prefixed wxgui blocks with WX GUI in the block names. Added category to wxgui variables blocks (not in the main block tree.xml) --- config/grc_gr_wxgui.m4 | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/grc_gr_wxgui.m4 b/config/grc_gr_wxgui.m4 index c443f7c6c..17925fcc5 100644 --- a/config/grc_gr_wxgui.m4 +++ b/config/grc_gr_wxgui.m4 @@ -36,6 +36,7 @@ AC_DEFUN([GRC_GR_WXGUI],[ AC_CONFIG_FILES([ \ gr-wxgui/Makefile \ gr-wxgui/gr-wxgui.pc \ + gr-wxgui/grc/Makefile \ gr-wxgui/src/Makefile \ gr-wxgui/src/python/Makefile \ gr-wxgui/src/python/plotter/Makefile \ -- cgit From d658659c4cb72385f921a03c37bb58b452190aab Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Mon, 7 Mar 2011 12:45:06 -0800 Subject: qtgui-grc: added check for pyqwt in config --- config/grc_gr_qtgui.m4 | 11 +++++------ config/grc_grc.m4 | 2 -- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'config') diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4 index c14f984c3..92392c883 100644 --- a/config/grc_gr_qtgui.m4 +++ b/config/grc_gr_qtgui.m4 @@ -29,13 +29,12 @@ AC_DEFUN([GRC_GR_QTGUI],[ dnl no : otherwise PYTHON_CHECK_MODULE([PyQt4.QtCore], [PyQt4 for Qt4], \ - [passed=yes], [passed=no], \ - [PyQt4.QtCore.PYQT_VERSION >= 260000]) + [], [passed=no], \ + [PyQt4.QtCore.PYQT_VERSION >= 260000]) - # Enable this if we want to test for PyQwt, too - #PYTHON_CHECK_MODULE([PyQt4.Qwt5], [PyQwt5 for Qt4], \ - # [passed=yes], [passed=no], \ - # [PyQt4.Qwt5.QWT_VERSION >= 327000]) + PYTHON_CHECK_MODULE([PyQt4.Qwt5], [PyQwt5 for Qt4], \ + [], [passed=no], \ + [PyQt4.Qwt5.QWT_VERSION >= 327000]) # Check for: # QtOpenGL diff --git a/config/grc_grc.m4 b/config/grc_grc.m4 index 9aff3cd1d..c21acccff 100644 --- a/config/grc_grc.m4 +++ b/config/grc_grc.m4 @@ -20,8 +20,6 @@ dnl Boston, MA 02110-1301, USA. AC_DEFUN([GRC_GRC],[ GRC_ENABLE(grc) -dnl GRC_CHECK_DEPENDENCY(grc, gr-wxgui) - AC_CHECK_PROG(XDG_UTILS, xdg-mime, true, false) AM_CONDITIONAL(XDG_UTILS, $XDG_UTILS) -- cgit From b9b5318101d596b8f06cf5640ddceb90bdb9235c Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 8 Mar 2011 23:13:13 -0800 Subject: audio: skeleton for gr-audio component --- config/grc_gr_audio.m4 | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 config/grc_gr_audio.m4 (limited to 'config') diff --git a/config/grc_gr_audio.m4 b/config/grc_gr_audio.m4 new file mode 100644 index 000000000..d20f10154 --- /dev/null +++ b/config/grc_gr_audio.m4 @@ -0,0 +1,35 @@ +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_AUDIO],[ + GRC_ENABLE(gr-audio) + + dnl Don't do gr-audio-alsa if gnuradio-core skipped + GRC_CHECK_DEPENDENCY(gr-audio, gnuradio-core) + + AC_CONFIG_FILES([ \ + gr-audio/Makefile \ + gr-audio/include/Makefile \ + gr-audio/lib/Makefile \ + gr-audio/swig/Makefile \ + gr-audio/gnuradio-audio.pc \ + ]) + + GRC_BUILD_CONDITIONAL(gr-audio) +]) -- cgit From 24d30ff306a906b21ad724c07a95caed24659887 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 9 Mar 2011 10:29:53 -0800 Subject: audio: work to get alsa support in, lets see if this works before adding more --- config/grc_gr_audio.m4 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'config') diff --git a/config/grc_gr_audio.m4 b/config/grc_gr_audio.m4 index d20f10154..9ca03a045 100644 --- a/config/grc_gr_audio.m4 +++ b/config/grc_gr_audio.m4 @@ -23,6 +23,9 @@ AC_DEFUN([GRC_GR_AUDIO],[ dnl Don't do gr-audio-alsa if gnuradio-core skipped GRC_CHECK_DEPENDENCY(gr-audio, gnuradio-core) + PKG_CHECK_MODULES(ALSA, alsa >= 0.9,[GR_AUDIO_ALSA_SUPPORT=true],[GR_AUDIO_ALSA_SUPPORT=false]) + AM_CONDITIONAL(GR_AUDIO_ALSA_SUPPORT, $GR_AUDIO_ALSA_SUPPORT) + AC_CONFIG_FILES([ \ gr-audio/Makefile \ gr-audio/include/Makefile \ -- cgit From 0644b009591f4c63ed05a8095a0c54c1501bac71 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 9 Mar 2011 11:44:35 -0800 Subject: audio: moved the grc audio blocks into gr-audio dir --- config/grc_gr_audio.m4 | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/grc_gr_audio.m4 b/config/grc_gr_audio.m4 index 9ca03a045..15f4d4eb6 100644 --- a/config/grc_gr_audio.m4 +++ b/config/grc_gr_audio.m4 @@ -28,6 +28,7 @@ AC_DEFUN([GRC_GR_AUDIO],[ AC_CONFIG_FILES([ \ gr-audio/Makefile \ + gr-audio/grc/Makefile \ gr-audio/include/Makefile \ gr-audio/lib/Makefile \ gr-audio/swig/Makefile \ -- cgit From 8bd65a04463692e6f179a5fc4f23d73782103781 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 9 Mar 2011 12:51:53 -0800 Subject: audio: added oss support to gr-audio --- config/grc_gr_audio.m4 | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/grc_gr_audio.m4 b/config/grc_gr_audio.m4 index 15f4d4eb6..05116b138 100644 --- a/config/grc_gr_audio.m4 +++ b/config/grc_gr_audio.m4 @@ -23,9 +23,42 @@ AC_DEFUN([GRC_GR_AUDIO],[ dnl Don't do gr-audio-alsa if gnuradio-core skipped GRC_CHECK_DEPENDENCY(gr-audio, gnuradio-core) - PKG_CHECK_MODULES(ALSA, alsa >= 0.9,[GR_AUDIO_ALSA_SUPPORT=true],[GR_AUDIO_ALSA_SUPPORT=false]) + #################################################################### + ## ALSA Support + #################################################################### + GR_AUDIO_ALSA_SUPPORT=true + dnl Don't do gr-audio-alsa if the 'alsa' package is not installed. + PKG_CHECK_MODULES(ALSA, alsa >= 0.9,[], + [GR_AUDIO_ALSA_SUPPORT=false;AC_MSG_RESULT([gr-audio alsa support requires package alsa, not found.])]) AM_CONDITIONAL(GR_AUDIO_ALSA_SUPPORT, $GR_AUDIO_ALSA_SUPPORT) + #################################################################### + ## OSS Support + #################################################################### + dnl Make sure the correct library and/or headers are available. + GR_AUDIO_OSS_SUPPORT=true + case $host_os in + netbsd*) + AC_HAVE_LIBRARY(ossaudio,[], + [GR_AUDIO_OSS_SUPPORT=false;AC_MSG_RESULT([gr-audio oss support requires library ossaudio, not found.])]) + if test $GR_AUDIO_OSS_SUPPORT != false; then + OSS_LIBS=-lossaudio + AC_SUBST(OSS_LIBS) + AC_MSG_RESULT([Using OSS library $OSS_LIBS]) + fi + ;; + darwin*) + dnl OSX / Darwin can't use OSS + GR_AUDIO_OSS_SUPPORT=false + ;; + *) + AC_CHECK_HEADER(sys/soundcard.h,[], + [GR_AUDIO_OSS_SUPPORT=false;AC_MSG_RESULT([gr-audio oss support requires sys/soundcard.h, not found.])]) + esac + AM_CONDITIONAL(GR_AUDIO_OSS_SUPPORT, $GR_AUDIO_OSS_SUPPORT) + + + AC_CONFIG_FILES([ \ gr-audio/Makefile \ gr-audio/grc/Makefile \ -- cgit From ef276a8ba31f920ac469b84466338e8693e43a2e Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 9 Mar 2011 16:10:31 -0800 Subject: audio: added config checks for other audios, added jack and port --- config/grc_gr_audio.m4 | 54 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 47 insertions(+), 7 deletions(-) (limited to 'config') diff --git a/config/grc_gr_audio.m4 b/config/grc_gr_audio.m4 index 05116b138..bcb19be35 100644 --- a/config/grc_gr_audio.m4 +++ b/config/grc_gr_audio.m4 @@ -20,15 +20,12 @@ dnl Boston, MA 02110-1301, USA. AC_DEFUN([GRC_GR_AUDIO],[ GRC_ENABLE(gr-audio) - dnl Don't do gr-audio-alsa if gnuradio-core skipped GRC_CHECK_DEPENDENCY(gr-audio, gnuradio-core) #################################################################### ## ALSA Support #################################################################### - GR_AUDIO_ALSA_SUPPORT=true - dnl Don't do gr-audio-alsa if the 'alsa' package is not installed. - PKG_CHECK_MODULES(ALSA, alsa >= 0.9,[], + PKG_CHECK_MODULES(ALSA, alsa >= 0.9,[GR_AUDIO_ALSA_SUPPORT=true], [GR_AUDIO_ALSA_SUPPORT=false;AC_MSG_RESULT([gr-audio alsa support requires package alsa, not found.])]) AM_CONDITIONAL(GR_AUDIO_ALSA_SUPPORT, $GR_AUDIO_ALSA_SUPPORT) @@ -36,10 +33,9 @@ AC_DEFUN([GRC_GR_AUDIO],[ ## OSS Support #################################################################### dnl Make sure the correct library and/or headers are available. - GR_AUDIO_OSS_SUPPORT=true case $host_os in netbsd*) - AC_HAVE_LIBRARY(ossaudio,[], + AC_HAVE_LIBRARY(ossaudio,[GR_AUDIO_OSS_SUPPORT=true], [GR_AUDIO_OSS_SUPPORT=false;AC_MSG_RESULT([gr-audio oss support requires library ossaudio, not found.])]) if test $GR_AUDIO_OSS_SUPPORT != false; then OSS_LIBS=-lossaudio @@ -52,12 +48,56 @@ AC_DEFUN([GRC_GR_AUDIO],[ GR_AUDIO_OSS_SUPPORT=false ;; *) - AC_CHECK_HEADER(sys/soundcard.h,[], + AC_CHECK_HEADER(sys/soundcard.h,[GR_AUDIO_OSS_SUPPORT=true], [GR_AUDIO_OSS_SUPPORT=false;AC_MSG_RESULT([gr-audio oss support requires sys/soundcard.h, not found.])]) esac AM_CONDITIONAL(GR_AUDIO_OSS_SUPPORT, $GR_AUDIO_OSS_SUPPORT) + #################################################################### + ## Jack Support + #################################################################### + PKG_CHECK_MODULES(JACK, jack >= 0.8, [GR_AUDIO_JACK_SUPPORT=true], + [GR_AUDIO_JACK_SUPPORT=false;AC_MSG_RESULT([gr-audio jack support requires package jack, not found.])]) + AM_CONDITIONAL(GR_AUDIO_JACK_SUPPORT, $GR_AUDIO_JACK_SUPPORT) + + #################################################################### + ## OSX Support + #################################################################### + case "$host_os" in + darwin*) + MACOSX_AUDIOUNIT([GR_AUDIO_OSX_SUPPORT=true], + [GR_AUDIO_OSX_SUPPORT=false;AC_MSG_RESULT([gr-audio osx support requires AudioUnit, not found.])]) + ;; + *) + AC_MSG_RESULT([gr-audio osx support will build on Mac OS X and Darwin only.]) + GR_AUDIO_OSX_SUPPORT=false + ;; + esac + AM_CONDITIONAL(GR_AUDIO_OSX_SUPPORT, $GR_AUDIO_OSX_SUPPORT) + #################################################################### + ## PortAudio Support + #################################################################### + PKG_CHECK_MODULES(PORTAUDIO, portaudio-2.0 >= 19,[GR_AUDIO_PORTAUDIO_SUPPORT=true], + [GR_AUDIO_PORTAUDIO_SUPPORT=false;AC_MSG_RESULT([gr-audio portaudio support requires package portaudio, not found.])]) + AM_CONDITIONAL(GR_AUDIO_PORTAUDIO_SUPPORT, $GR_AUDIO_PORTAUDIO_SUPPORT) + + #################################################################### + ## Windows Support + #################################################################### + case "$host_os" in + cygwin*|win*|mingw*) + AC_HAVE_LIBRARY(winmm, [GR_AUDIO_WINDOWS_SUPPORT=true], + [GR_AUDIO_WINDOWS_SUPPORT=false;AC_MSG_RESULT([gr-audio windows support requires library winmm, not found.])]) + ;; + *) + AC_MSG_RESULT([gr-audio windows support will build on a Windows Unix environment only.]) + GR_AUDIO_WINDOWS_SUPPORT=false + ;; + esac + WINAUDIO_LIBS=-lwinmm + AC_SUBST(WINAUDIO_LIBS) + AM_CONDITIONAL(GR_AUDIO_WINDOWS_SUPPORT, $GR_AUDIO_WINDOWS_SUPPORT) AC_CONFIG_FILES([ \ gr-audio/Makefile \ -- cgit From 07bd878bc30f7ab54afc1e2f0055419388c3c992 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Sun, 13 Mar 2011 17:33:33 -0700 Subject: grc: moved all usrp1 and usrp2 stuff out of grc and into gr-usrp*/grc Moved grc xml files, python wrappers (USRP1 only), probe apps + freedesktop files. When the gr-usrp and gr-usrp2 directories are removed, grc will not have to change. Minor change: the freedesktop files are always installed now. This does not mean that they are installed properly with xdg, it just means that the runtime can have access to the icons. --- config/grc_gr_usrp.m4 | 3 ++- config/grc_gr_usrp2.m4 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/grc_gr_usrp.m4 b/config/grc_gr_usrp.m4 index b850f0050..c3d2667ca 100644 --- a/config/grc_gr_usrp.m4 +++ b/config/grc_gr_usrp.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2011 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -26,6 +26,7 @@ AC_DEFUN([GRC_GR_USRP],[ AC_CONFIG_FILES([ \ gr-usrp/Makefile \ + gr-usrp/grc/Makefile \ gr-usrp/gnuradio-usrp.pc \ gr-usrp/src/Makefile \ gr-usrp/src/run_tests \ diff --git a/config/grc_gr_usrp2.m4 b/config/grc_gr_usrp2.m4 index 5a9bb3b70..3d64db6d6 100644 --- a/config/grc_gr_usrp2.m4 +++ b/config/grc_gr_usrp2.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2008 Free Software Foundation, Inc. +dnl Copyright 2008,2011 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -26,6 +26,7 @@ AC_DEFUN([GRC_GR_USRP2],[ AC_CONFIG_FILES([ \ gr-usrp2/Makefile \ + gr-usrp2/grc/Makefile \ gr-usrp2/gnuradio-usrp2.pc \ gr-usrp2/src/Makefile \ gr-usrp2/src/run_tests \ -- cgit From 5748eff26f835bffedb41bd5748ccbaefbe1e02f Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Mon, 14 Mar 2011 10:26:56 -0700 Subject: audio: remove obsoleted individual top-level components --- config/Makefile.am | 7 +---- config/grc_gr_audio_alsa.m4 | 49 ------------------------------- config/grc_gr_audio_jack.m4 | 47 ------------------------------ config/grc_gr_audio_oss.m4 | 63 ---------------------------------------- config/grc_gr_audio_osx.m4 | 53 --------------------------------- config/grc_gr_audio_portaudio.m4 | 47 ------------------------------ config/grc_gr_audio_windows.m4 | 56 ----------------------------------- 7 files changed, 1 insertion(+), 321 deletions(-) delete mode 100644 config/grc_gr_audio_alsa.m4 delete mode 100644 config/grc_gr_audio_jack.m4 delete mode 100644 config/grc_gr_audio_oss.m4 delete mode 100644 config/grc_gr_audio_osx.m4 delete mode 100644 config/grc_gr_audio_portaudio.m4 delete mode 100644 config/grc_gr_audio_windows.m4 (limited to 'config') diff --git a/config/Makefile.am b/config/Makefile.am index 68ff3c78c..535844507 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -51,12 +51,7 @@ m4macros = \ grc_gnuradio_examples.m4 \ grc_grc.m4 \ grc_gr_atsc.m4 \ - grc_gr_audio_alsa.m4 \ - grc_gr_audio_jack.m4 \ - grc_gr_audio_oss.m4 \ - grc_gr_audio_osx.m4 \ - grc_gr_audio_portaudio.m4 \ - grc_gr_audio_windows.m4 \ + grc_gr_audio.m4 \ grc_gr_comedi.m4 \ grc_gr_gcell.m4 \ grc_gr_gpio.m4 \ diff --git a/config/grc_gr_audio_alsa.m4 b/config/grc_gr_audio_alsa.m4 deleted file mode 100644 index 35389d81d..000000000 --- a/config/grc_gr_audio_alsa.m4 +++ /dev/null @@ -1,49 +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_AUDIO_ALSA],[ - GRC_ENABLE(gr-audio-alsa) - - dnl Don't do gr-audio-alsa if gnuradio-core skipped - GRC_CHECK_DEPENDENCY(gr-audio-alsa, 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-alsa if the 'alsa' package is not installed. - PKG_CHECK_MODULES(ALSA, alsa >= 0.9,[], - [passed=no;AC_MSG_RESULT([gr-audio-alsa requires package alsa, not found.])]) - fi - - AC_CONFIG_FILES([ \ - gr-audio-alsa/Makefile \ - gr-audio-alsa/gnuradio-audio-alsa.pc \ - gr-audio-alsa/src/Makefile \ - gr-audio-alsa/src/run_guile_tests \ - gr-audio-alsa/src/run_tests \ - ]) - - GRC_BUILD_CONDITIONAL(gr-audio-alsa,[ - dnl run_tests is created from run_tests.in. Make it executable. - AC_CONFIG_COMMANDS([run_tests_alsa], - [chmod +x gr-audio-alsa/src/run_tests gr-audio-alsa/src/run_guile_tests]) - ]) -]) diff --git a/config/grc_gr_audio_jack.m4 b/config/grc_gr_audio_jack.m4 deleted file mode 100644 index d1853588b..000000000 --- a/config/grc_gr_audio_jack.m4 +++ /dev/null @@ -1,47 +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_AUDIO_JACK],[ - 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([ \ - gr-audio-jack/Makefile \ - gr-audio-jack/gnuradio-audio-jack.pc \ - gr-audio-jack/src/Makefile \ - gr-audio-jack/src/run_tests \ - ]) - - 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]) - ]) -]) diff --git a/config/grc_gr_audio_oss.m4 b/config/grc_gr_audio_oss.m4 deleted file mode 100644 index 13c83bba9..000000000 --- a/config/grc_gr_audio_oss.m4 +++ /dev/null @@ -1,63 +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_AUDIO_OSS],[ - GRC_ENABLE(gr-audio-oss) - - dnl Don't do gr-audio-oss if gnuradio-core skipped - GRC_CHECK_DEPENDENCY(gr-audio-oss, 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 Make sure the correct library and/or headers are available. - case $host_os in - netbsd*) - AC_HAVE_LIBRARY(ossaudio,[], - [passed=no;AC_MSG_RESULT([gr-audio-oss requires library ossaudio, not found.])]) - if test $passed != no; then - OSS_LIBS=-lossaudio - AC_SUBST(OSS_LIBS) - AC_MSG_RESULT([Using OSS library $OSS_LIBS]) - fi - ;; - darwin*) - dnl OSX / Darwin can't use OSS - passed=no - ;; - *) - AC_CHECK_HEADER(sys/soundcard.h,[], - [passed=no;AC_MSG_RESULT([gr-audio-oss requires sys/soundcard.h, not found.])]) - esac - fi - - AC_CONFIG_FILES([ \ - gr-audio-oss/Makefile \ - gr-audio-oss/gnuradio-audio-oss.pc \ - gr-audio-oss/src/Makefile \ - gr-audio-oss/src/run_tests \ - ]) - - GRC_BUILD_CONDITIONAL(gr-audio-oss,[ - dnl run_tests is created from run_tests.in. Make it executable. - AC_CONFIG_COMMANDS([run_tests_oss], [chmod +x gr-audio-oss/src/run_tests]) - ]) -]) diff --git a/config/grc_gr_audio_osx.m4 b/config/grc_gr_audio_osx.m4 deleted file mode 100644 index df8634ff6..000000000 --- a/config/grc_gr_audio_osx.m4 +++ /dev/null @@ -1,53 +0,0 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2010 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_AUDIO_OSX],[ - GRC_ENABLE(gr-audio-osx) - - dnl Don't do gr-audio-osx if gnuradio-core skipped - 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 \ - ]) - - 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]) - ]) -]) diff --git a/config/grc_gr_audio_portaudio.m4 b/config/grc_gr_audio_portaudio.m4 deleted file mode 100644 index ff551b38a..000000000 --- a/config/grc_gr_audio_portaudio.m4 +++ /dev/null @@ -1,47 +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_AUDIO_PORTAUDIO],[ - GRC_ENABLE(gr-audio-portaudio) - - dnl Don't do gr-audio-portaudio if gnuradio-core skipped - GRC_CHECK_DEPENDENCY(gr-audio-portaudio, 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-portaudio if the 'portaudio' library is unavailable. - PKG_CHECK_MODULES(PORTAUDIO, portaudio-2.0 >= 19,[], - [passed=no;AC_MSG_RESULT([gr-audio-portaudio requires package portaudio, not found.])]) - fi - - AC_CONFIG_FILES([ \ - gr-audio-portaudio/Makefile \ - gr-audio-portaudio/gnuradio-audio-portaudio.pc \ - gr-audio-portaudio/src/Makefile \ - gr-audio-portaudio/src/run_tests \ - ]) - - GRC_BUILD_CONDITIONAL(gr-audio-portaudio,[ - dnl run_tests is created from run_tests.in. Make it executable. - AC_CONFIG_COMMANDS([run_tests_portaudio], [chmod +x gr-audio-portaudio/src/run_tests]) - ]) -]) diff --git a/config/grc_gr_audio_windows.m4 b/config/grc_gr_audio_windows.m4 deleted file mode 100644 index bb6244163..000000000 --- a/config/grc_gr_audio_windows.m4 +++ /dev/null @@ -1,56 +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_AUDIO_WINDOWS],[ - GRC_ENABLE(gr-audio-windows) - - dnl Don't do gr-audio-windows if gnuradio-core skipped - GRC_CHECK_DEPENDENCY(gr-audio-windows, 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 - cygwin*|win*|mingw*) - dnl Don't do gr-audio-windows if the 'winmm' library isn't available. - AC_HAVE_LIBRARY(winmm, [], - [passed=no;AC_MSG_RESULT([gr-audio-windows requires library winmm, not found.])]) - ;; - *) - AC_MSG_RESULT([gr-audio-windows will build on a Windows Unix environment only.]) - passed=no - ;; - esac - fi - - AC_CONFIG_FILES([ \ - gr-audio-windows/Makefile \ - gr-audio-windows/src/Makefile \ - gr-audio-windows/src/run_tests \ - ]) - - GRC_BUILD_CONDITIONAL(gr-audio-windows,[ - WINAUDIO_LIBS=-lwinmm - AC_SUBST(WINAUDIO_LIBS) - dnl run_tests is created from run_tests.in. Make it executable. - AC_CONFIG_COMMANDS([run_tests_audio_windows], [chmod +x gr-audio-windows/src/run_tests]) - ]) -]) -- cgit From 7df5b10ddcd64309a5c299f662a4cd62a7d175ab Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Mon, 14 Mar 2011 15:20:19 -0700 Subject: gnuradio-examples: add C++ audio examples using new gr-audio * gnuradio-examples/C++/audio/dial_tone --- config/grc_gnuradio_examples.m4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/grc_gnuradio_examples.m4 b/config/grc_gnuradio_examples.m4 index 0aad0c0da..203f39d0d 100644 --- a/config/grc_gnuradio_examples.m4 +++ b/config/grc_gnuradio_examples.m4 @@ -20,12 +20,14 @@ dnl Boston, MA 02110-1301, USA. AC_DEFUN([GRC_GNURADIO_EXAMPLES],[ GRC_ENABLE(gnuradio-examples) - dnl Do not do gnuradio-examples if gnuradio-core skipped + dnl Do not do gnuradio-examples if gnuradio-core or gr-audio skipped GRC_CHECK_DEPENDENCY(gnuradio-examples, gnuradio-core) + GRC_CHECK_DEPENDENCY(gnuradio-examples, gr-audio) AC_CONFIG_FILES([ \ gnuradio-examples/Makefile \ gnuradio-examples/c++/Makefile \ + gnuradio-examples/c++/audio/Makefile \ gnuradio-examples/python/Makefile \ gnuradio-examples/grc/Makefile \ gnuradio-examples/python/apps/hf_explorer/Makefile \ -- cgit From ee849707c09335f4c682151044a0e65321f7939d Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Mon, 14 Mar 2011 21:00:13 -0400 Subject: gruel: fixing structure. Passes make check. --- config/grc_gruel.m4 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/grc_gruel.m4 b/config/grc_gruel.m4 index 729571434..c3238b39e 100644 --- a/config/grc_gruel.m4 +++ b/config/grc_gruel.m4 @@ -42,12 +42,16 @@ AC_DEFUN([GRC_GRUEL],[ gruel/src/include/gruel/Makefile \ gruel/src/include/gruel/inet.h \ gruel/src/lib/Makefile \ + gruel/src/swig/Makefile \ + gruel/src/python/Makefile \ + gruel/src/python/run_tests \ gruel/src/lib/pmt/Makefile \ gruel/src/lib/msg/Makefile \ gruel/src/scheme/Makefile \ gruel/src/scheme/gnuradio/Makefile \ ]) + dnl Allow creating autoconf independent header files for bytesex routines AC_CHECK_HEADER(arpa/inet.h, [GR_HAVE_ARPA_INET=1],[GR_HAVE_ARPA_INET=0]) AC_CHECK_HEADER(netinet/in.h, [GR_HAVE_NETINET_IN=1],[GR_HAVE_NETINET_IN=0]) @@ -56,5 +60,7 @@ AC_DEFUN([GRC_GRUEL],[ AC_SUBST(GR_HAVE_NETINET_IN) AC_SUBST(GR_HAVE_BYTESWAP) - GRC_BUILD_CONDITIONAL(gruel,[]) + GRC_BUILD_CONDITIONAL(gruel,[ + AC_CONFIG_COMMANDS([run_tests_gruel],[chmod +x gruel/src/python/run_tests]) + ]) ]) -- cgit