diff options
| author | Johnathan Corgan | 2012-03-13 17:38:12 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-03-13 17:38:12 -0700 |
| commit | 62c6323bdb06d7d3f103d3a75265d45ae6ce00b4 (patch) | |
| tree | 7f995aba5eb3f2e0bfeac3a4114307fd2c5a6f3a /config/grc_volk.m4 | |
| parent | 83c6ee03ada6a44788421ebfe813b7d594fc8a7a (diff) | |
| parent | 8e013157752f1b42665430fde0f1c6f7d7147153 (diff) | |
| download | gnuradio-62c6323bdb06d7d3f103d3a75265d45ae6ce00b4.tar.gz gnuradio-62c6323bdb06d7d3f103d3a75265d45ae6ce00b4.tar.bz2 gnuradio-62c6323bdb06d7d3f103d3a75265d45ae6ce00b4.zip | |
Merge remote branch 'gnuradio/maint' into gr-uhd-set-user-register
Diffstat (limited to 'config/grc_volk.m4')
| -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 |