summaryrefslogtreecommitdiff
path: root/config/grc_volk.m4
diff options
context:
space:
mode:
authorJohnathan Corgan2012-02-14 15:37:57 -0800
committerJohnathan Corgan2012-02-14 15:37:57 -0800
commit2eaa0a6e1e57cfc374c258c317ecb469fc49bf53 (patch)
tree805f18179d4aa0ff3c96a11fe37ea3fd0aee01bf /config/grc_volk.m4
parentf0a1631dad755d5abf28351f07b2bbf7773b37b8 (diff)
downloadgnuradio-2eaa0a6e1e57cfc374c258c317ecb469fc49bf53.tar.gz
gnuradio-2eaa0a6e1e57cfc374c258c317ecb469fc49bf53.tar.bz2
gnuradio-2eaa0a6e1e57cfc374c258c317ecb469fc49bf53.zip
build: fix autotools for gnuradio-core volkification
Diffstat (limited to 'config/grc_volk.m4')
-rw-r--r--config/grc_volk.m47
1 files changed, 3 insertions, 4 deletions
diff --git a/config/grc_volk.m4 b/config/grc_volk.m4
index f349d5e99..cc6d75649 100644
--- a/config/grc_volk.m4
+++ b/config/grc_volk.m4
@@ -26,11 +26,10 @@ AC_DEFUN([GRC_VOLK],[
dnl Test if $enable_volk is:
dnl yes : if the --enable code passed muster and all dependencies are met
dnl no : otherwise, then do not set variables
- if test $passed != with && test x$enable_volk == xyes; then
+ if test $passed != with && test x$enable_volk != xno; 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"
+ volk_INCLUDES="-I\${abs_top_srcdir}/volk/gen/include -I\${abs_top_srcdir}/volk/include"
+ volk_LA="\${abs_top_builddir}/volk/lib/libvolk.la"
fi
dnl volk uses a subsidiary configure.ac