diff options
| author | Tom Rondeau | 2011-02-01 23:19:28 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2011-02-01 23:19:28 -0500 |
| commit | 800686701206e438e5a5d645242137f9285c4fa9 (patch) | |
| tree | a95ad9bac09e3a6cec43f741cc3eab17771a2fe2 /volk/config/lv_configure.m4 | |
| parent | 023167ca8a85ab597f9e59302733f71809a8afbd (diff) | |
| parent | 6503e3b21978b71908400c994148836bec4a97b9 (diff) | |
| download | gnuradio-800686701206e438e5a5d645242137f9285c4fa9.tar.gz gnuradio-800686701206e438e5a5d645242137f9285c4fa9.tar.bz2 gnuradio-800686701206e438e5a5d645242137f9285c4fa9.zip | |
Merge branch 'volk_rename' into next
Conflicts:
volk/include/volk/Makefile.am
volk/lib/Makefile.am
volk/lib/qa_volk.cc
Diffstat (limited to 'volk/config/lv_configure.m4')
| -rw-r--r-- | volk/config/lv_configure.m4 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/volk/config/lv_configure.m4 b/volk/config/lv_configure.m4 index c7a5fe960..f98b2dc5b 100644 --- a/volk/config/lv_configure.m4 +++ b/volk/config/lv_configure.m4 @@ -100,6 +100,9 @@ dnl AM_CONDITIONAL([USE_PYTHON], [test "$with_python" = yes]) GR_PWIN32 GR_LIBGNURADIO_CORE_EXTRA_LDFLAGS + dnl Check for liborc + ORC_CHECK + LDFLAGS="$LDFLAGS $LIBGNURADIO_CORE_EXTRA_LDFLAGS" AC_CHECK_PROG([XMLTO],[xmlto],[yes],[]) |