diff options
| author | Tom Rondeau | 2010-12-09 12:12:47 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2010-12-09 12:12:47 -0500 |
| commit | a72fa7a12cad5b32f06709c8939a4fb054679ca6 (patch) | |
| tree | fa1acf97737e95bc2f867e705790e9cdfa10278a | |
| parent | 63f520734e4e112da32f0dc5a59107c1397199ae (diff) | |
| download | gnuradio-a72fa7a12cad5b32f06709c8939a4fb054679ca6.tar.gz gnuradio-a72fa7a12cad5b32f06709c8939a4fb054679ca6.tar.bz2 gnuradio-a72fa7a12cad5b32f06709c8939a4fb054679ca6.zip | |
volk: Small fixes to M4 file for better project integration.
| -rw-r--r-- | config/grc_volk.m4 | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/config/grc_volk.m4 b/config/grc_volk.m4 index ea9ca9101..1b3c54dd7 100644 --- a/config/grc_volk.m4 +++ b/config/grc_volk.m4 @@ -24,22 +24,16 @@ AC_DEFUN([GRC_VOLK],[ dnl volk uses a subsidiary configure.ac AC_CONFIG_SUBDIRS([volk]) - GRC_CHECK_DEPENDENCY(volk, gruel) - 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}/include" - VOLK_LA="\${abs_top_builddir}/volk/lib/libvolk.la \ - ${abs_top_builddir}/volk/lib/libvolk_runtime.la" + 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 - dnl Include the volk INCLUDES and LA - AC_SUBST(VOLK_INCLUDES) - AC_SUBST(VOLK_LA) - GRC_BUILD_CONDITIONAL(volk, []) ]) |