diff options
author | Josh Blum | 2011-10-17 23:40:51 -0700 |
---|---|---|
committer | Josh Blum | 2011-10-17 23:40:51 -0700 |
commit | 161910c66e88c081d267f4b2b699f7431f287279 (patch) | |
tree | 86500bb995f5afeece82042eb29eeb3716151d1d /config/ax_boost_base.m4 | |
parent | 41ce01bd6f602009b83422550b0b91bddd830c84 (diff) | |
parent | f664585ddddeb040d1cd285d0b9dfb41c4979b91 (diff) | |
download | gnuradio-161910c66e88c081d267f4b2b699f7431f287279.tar.gz gnuradio-161910c66e88c081d267f4b2b699f7431f287279.tar.bz2 gnuradio-161910c66e88c081d267f4b2b699f7431f287279.zip |
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
Conflicts:
gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h
gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h
gnuradio-core/src/lib/general/gr_ofdm_demapper_vcb.h
gr-digital/include/digital_ofdm_cyclic_prefixer.h
gr-digital/include/digital_ofdm_frame_acquisition.h
gr-digital/include/digital_ofdm_frame_sink.h
gr-digital/include/digital_ofdm_insert_preamble.h
gr-digital/include/digital_ofdm_mapper_bcv.h
gr-digital/include/digital_ofdm_sampler.h
Diffstat (limited to 'config/ax_boost_base.m4')
-rw-r--r-- | config/ax_boost_base.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/ax_boost_base.m4 b/config/ax_boost_base.m4 index e9d42ee9a..f2a7f6e83 100644 --- a/config/ax_boost_base.m4 +++ b/config/ax_boost_base.m4 @@ -305,7 +305,7 @@ dnl $2 is AC_LANG_PROGRAM argument 1 dnl $3 is AC_LANG_PROGRAM argument 2 dnl $4 is cv variable name. E.g., ax_cv_boost_thread AC_DEFUN([_AX_BOOST_CHECK_],[ - _AX_BOOST_WITH($1) + _AX_BOOST_WITH([$1]) if test "$want_boost" = "yes"; then AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([AC_PROG_CXX]) |