diff options
| author | Tom Rondeau | 2012-02-14 19:43:51 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2012-02-14 19:43:51 -0500 |
| commit | 4f0b3fbe765b9f4ce744e2c2c182715fc63756e2 (patch) | |
| tree | 93665d11dbbec89ab376d4aead5ff321644f64ba /config | |
| parent | ba3f1a4e8d5879c91eb5c47cc7e7c3ac73b1989d (diff) | |
| parent | 2eaa0a6e1e57cfc374c258c317ecb469fc49bf53 (diff) | |
| download | gnuradio-4f0b3fbe765b9f4ce744e2c2c182715fc63756e2.tar.gz gnuradio-4f0b3fbe765b9f4ce744e2c2c182715fc63756e2.tar.bz2 gnuradio-4f0b3fbe765b9f4ce744e2c2c182715fc63756e2.zip | |
Merge branch 'safe_align' of vortex.corganenterprises.com:gnuradio-trondeau into 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 |