diff options
| author | Eric Blossom <eb@comsec.com> | 2010-12-21 13:31:58 -0800 |
|---|---|---|
| committer | Eric Blossom <eb@comsec.com> | 2010-12-21 13:31:58 -0800 |
| commit | 75b650ef2506fe5c607517a3d5188b0705f60fde (patch) | |
| tree | 99cb6fd6adc3e91edc832cbaee236d2fe30fa3fd /config | |
| parent | 1984aab345857296564e174395cf3af1375e1469 (diff) | |
| parent | ed78ba5d9999bbe50507373a1aa2877ef0da64c6 (diff) | |
Merge branch 'next' into guile.
Passes distcheck.
* next: (32 commits)
volk: Fix for popcnt's 64/32-bit issues.
Using a copy of config.guess and config.sub instead of sym links.
Including time header to qa files.
Changed python env variable to more globally usable version.
gr_uhd: Quick fix for make distcheck failures if UHD is not installed.
PFB resampler: fix it this way to avoid the signed/unsigned warning.
PFB resampler: fixes bug where filter could be looking past the number of inputs.
resampler PFB: Sets relative rate when rate is changed.
Create method to set rate on pfb_arb_resamp after it has been created. Allow it to be called from GRC.
volk: fix for running 32-bit OS on 64-bit processor. System is correctly identified as 32-bit and compiles with the correct flags.
volk: changing the path variables again. This works on my various systems tested. Using abs_ path names failed on Ubuntu 8.04 32-bit.
volk: May be a hack, but it was required for my 32-bit Fedora 13 to work.
volk: Removing unnecessary shell script; last commit takes care if its functions.
volk: Fixing build system to handle making volk_mktables, volk_tables.h, and volk_config.h instead of a standalone shell script.
volk: readding 16sc_magnitude_32f_sse with fix for SSE hadd_ps error.
volk: Adding a few more generic-only test cases.
volk: adding generic QA test for 16sc_magnitude_32f.
volk: modified the configure scripts to output which architectures it will be building based on the configure tests.
uhd: update notes in grc blocks for addressing scheme
volk: Removing erroneous SSE function that actually usese an SSE3 intrin (mm_hadd_ps).
...
Diffstat (limited to 'config')
| -rw-r--r-- | config/grc_gr_uhd.m4 | 4 | ||||
| -rw-r--r-- | config/grc_volk.m4 | 39 |
2 files changed, 43 insertions, 0 deletions
diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4 index 00892867dd..a9404425a4 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([ \ diff --git a/config/grc_volk.m4 b/config/grc_volk.m4 new file mode 100644 index 0000000000..1b3c54dd7c --- /dev/null +++ b/config/grc_volk.m4 @@ -0,0 +1,39 @@ +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]) + + 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}/volk/include" + volk_LA="\${abs_top_builddir}/volk/lib/libvolk.la \ + \${abs_top_builddir}/volk/lib/libvolk_runtime.la" + fi + + GRC_BUILD_CONDITIONAL(volk, []) +]) |