diff options
| author | Johnathan Corgan | 2012-03-01 16:37:58 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2012-03-01 16:37:58 -0800 |
| commit | 0a6f1494b8e462c13c8c48c69680832967ebec72 (patch) | |
| tree | 4266dba3cd7b8ef50791859761ec645010ed571e /config | |
| parent | 088ca3e5ff1ea0c28bbc2f674382137d8b84fe51 (diff) | |
| parent | e8d644872837f4cbfc05851710531b2ac5259806 (diff) | |
| download | gnuradio-0a6f1494b8e462c13c8c48c69680832967ebec72.tar.gz gnuradio-0a6f1494b8e462c13c8c48c69680832967ebec72.tar.bz2 gnuradio-0a6f1494b8e462c13c8c48c69680832967ebec72.zip | |
Merge remote branch 'tom/safe_align'
Diffstat (limited to 'config')
| -rw-r--r-- | config/grc_volk.m4 | 7 |
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 |