diff options
| author | Tom Rondeau | 2012-03-19 13:55:53 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2012-03-19 13:55:53 -0400 |
| commit | 77834b2dcf0f4b06f07a5f143e70e21160eae88e (patch) | |
| tree | 0b72c27cc3d967f08206c7db523f8b461e2800f4 /volk | |
| parent | bbddd082607a8632322d7774ae8ad54e7e84f6de (diff) | |
| parent | c9ff4b288d981780dbb6e0bb5fc304997cadc2b1 (diff) | |
| download | gnuradio-77834b2dcf0f4b06f07a5f143e70e21160eae88e.tar.gz gnuradio-77834b2dcf0f4b06f07a5f143e70e21160eae88e.tar.bz2 gnuradio-77834b2dcf0f4b06f07a5f143e70e21160eae88e.zip | |
Merge branch 'maint'
Diffstat (limited to 'volk')
| -rw-r--r-- | volk/cmake/FindORC.cmake | 2 | ||||
| -rw-r--r-- | volk/config/orc.m4 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/volk/cmake/FindORC.cmake b/volk/cmake/FindORC.cmake index 8d8c2d13e..1c4c417ad 100644 --- a/volk/cmake/FindORC.cmake +++ b/volk/cmake/FindORC.cmake @@ -1,5 +1,5 @@ FIND_PACKAGE(PkgConfig) -PKG_CHECK_MODULES(PC_ORC orc-0.4) +PKG_CHECK_MODULES(PC_ORC "orc-0.4 > 0.4.11") diff --git a/volk/config/orc.m4 b/volk/config/orc.m4 index d17160a9a..e332939d3 100644 --- a/volk/config/orc.m4 +++ b/volk/config/orc.m4 @@ -5,7 +5,7 @@ dnl ORC_CHECK([REQUIRED_VERSION]) AC_DEFUN([ORC_CHECK], [ - ORC_REQ=ifelse([$1], , "0.4.10", [$1]) + ORC_REQ=ifelse([$1], , "0.4.12", [$1]) if test "x$enable_orc" != "xno" ; then PKG_CHECK_MODULES(ORC, orc-0.4 >= $ORC_REQ, [ |