diff options
| author | Tom Rondeau | 2011-04-21 23:28:31 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-04-21 23:28:31 -0400 |
| commit | c7b491e220394efde4828b443237dcea10cbae45 (patch) | |
| tree | b48bbe867f7a28096790a3d9083a79bb60c44f63 /config/grc_volk.m4 | |
| parent | a4ac44d7adbd9c6cdd107ec7985e294fea81845a (diff) | |
| download | gnuradio-c7b491e220394efde4828b443237dcea10cbae45.tar.gz gnuradio-c7b491e220394efde4828b443237dcea10cbae45.tar.bz2 gnuradio-c7b491e220394efde4828b443237dcea10cbae45.zip | |
volk: fixing volk M4 so that nothing of Volk exists and its configure does not run if --disable-volk is used.
Diffstat (limited to 'config/grc_volk.m4')
| -rw-r--r-- | config/grc_volk.m4 | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/config/grc_volk.m4 b/config/grc_volk.m4 index 1b3c54dd7..f349d5e99 100644 --- a/config/grc_volk.m4 +++ b/config/grc_volk.m4 @@ -21,19 +21,23 @@ AC_DEFUN([GRC_VOLK],[ GRC_ENABLE(volk) GRC_WITH(volk) - dnl volk uses a subsidiary configure.ac - AC_CONFIG_SUBDIRS([volk]) - - dnl If execution gets to here, $passed will be: - dnl with : if the --with code didn't error out + dnl If execution gets to here, test if $passed is: + dnl with : if the --with code didn't error out, use these values + dnl Test if $enable_volk is: dnl yes : if the --enable code passed muster and all dependencies are met - dnl no : otherwise - if test $passed != with; then + dnl no : otherwise, then do not set variables + if test $passed != with && test x$enable_volk == xyes; 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" fi + dnl volk uses a subsidiary configure.ac + dnl only run if building Volk + if test $passed == yes && test x$enable_volk != xno; then + AC_CONFIG_SUBDIRS([volk]) + fi + GRC_BUILD_CONDITIONAL(volk, []) ]) |