diff options
| author | Tom Rondeau | 2011-01-30 12:35:07 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2011-01-30 12:35:07 -0500 |
| commit | 6503e3b21978b71908400c994148836bec4a97b9 (patch) | |
| tree | 75aec6950e532f489b954d7f757149b1d8f67b54 /volk/config | |
| parent | a3ee5073e1035154a3331ec7ab4f1842095b7ed4 (diff) | |
| download | gnuradio-6503e3b21978b71908400c994148836bec4a97b9.tar.gz gnuradio-6503e3b21978b71908400c994148836bec4a97b9.tar.bz2 gnuradio-6503e3b21978b71908400c994148836bec4a97b9.zip | |
volk: Updating build structure to work when orc is not installed.
Distcheck passes for me if liborc is installed or not.
Diffstat (limited to 'volk/config')
| -rw-r--r-- | volk/config/orc.m4 | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/volk/config/orc.m4 b/volk/config/orc.m4 index a4653400c..df0f3d6f3 100644 --- a/volk/config/orc.m4 +++ b/volk/config/orc.m4 @@ -7,10 +7,9 @@ AC_DEFUN([ORC_CHECK], [ ORC_REQ=ifelse([$1], , "0.4.10", [$1]) - enable_orc = auto if test "x$enable_orc" != "xno" ; then PKG_CHECK_MODULES(ORC, orc-0.4 >= $ORC_REQ, [ - AC_DEFINE(HAVE_ORC, 1, [Use Orc]) + AC_DEFINE(LV_HAVE_ORC, 1, [Use Orc]) if test "x$ORCC" = "x" ; then ORCC=`$PKG_CONFIG --variable=orcc orc-0.4` fi @@ -21,32 +20,31 @@ AC_DEFUN([ORC_CHECK], AC_SUBST(ORCC_FLAGS) AC_SUBST(ORC_LDFLAGS) AC_SUBST(ORC_CFLAGS) - HAVE_ORC=yes - HAVE_ORCC=yes + LV_HAVE_ORC=yes + LV_HAVE_ORCC=yes if test "x$cross_compiling" = "xyes" ; then - HAVE_ORCC=no + LV_HAVE_ORCC=no fi ], [ if test "x$enable_orc" = "xyes" ; then AC_MSG_ERROR([--enable-orc specified, but Orc >= $ORC_REQ not found]) fi AC_DEFINE(DISABLE_ORC, 1, [Disable Orc]) - HAVE_ORC=no - HAVE_ORCC=no + LV_HAVE_ORC=no + LV_HAVE_ORCC=no ]) else AC_DEFINE(DISABLE_ORC, 1, [Disable Orc]) - HAVE_ORC=no - HAVE_ORCC=no + LV_HAVE_ORC=no + LV_HAVE_ORCC=no fi - AM_CONDITIONAL(HAVE_ORC, [test "x$HAVE_ORC" = "xyes"]) - AM_CONDITIONAL(HAVE_ORCC, [test "x$HAVE_ORCC" = "xyes"]) - + AM_CONDITIONAL(LV_HAVE_ORC, [test "x$LV_HAVE_ORC" = "xyes"]) + AM_CONDITIONAL(LV_HAVE_ORCC, [test "x$LV_HAVE_ORCC" = "xyes"]) ])) AC_DEFUN([ORC_OUTPUT], [ - if test "$HAVE_ORC" = yes ; then + if test "$LV_HAVE_ORC" = yes ; then printf "configure: *** Orc acceleration enabled.\n" else if test "x$enable_orc" = "xno" ; then |