diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-01-30 12:35:07 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-01-30 12:35:07 -0500 |
| commit | 6503e3b21978b71908400c994148836bec4a97b9 (patch) | |
| tree | 75aec6950e532f489b954d7f757149b1d8f67b54 | |
| parent | a3ee5073e1035154a3331ec7ab4f1842095b7ed4 (diff) | |
volk: Updating build structure to work when orc is not installed.
Distcheck passes for me if liborc is installed or not.
| -rw-r--r-- | volk/config/orc.m4 | 24 | ||||
| -rw-r--r-- | volk/configure.ac | 5 | ||||
| -rw-r--r-- | volk/include/volk/make_set_simd.py | 1 | ||||
| -rw-r--r-- | volk/lib/Makefile.am | 5 |
4 files changed, 14 insertions, 21 deletions
diff --git a/volk/config/orc.m4 b/volk/config/orc.m4 index a4653400cc..df0f3d6f33 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 diff --git a/volk/configure.ac b/volk/configure.ac index eeb7441baf..c493adad62 100644 --- a/volk/configure.ac +++ b/volk/configure.ac @@ -68,12 +68,9 @@ AC_CONFIG_FILES([\ include/Makefile \ include/volk/Makefile \ lib/Makefile \ + orc/Makefile \ volk.pc \ ]) - -if test "$HAVE_ORC" = yes; then - AC_CONFIG_FILES([orc/Makefile]) -fi AC_OUTPUT diff --git a/volk/include/volk/make_set_simd.py b/volk/include/volk/make_set_simd.py index f2b7c06562..019833b436 100644 --- a/volk/include/volk/make_set_simd.py +++ b/volk/include/volk/make_set_simd.py @@ -280,7 +280,6 @@ def make_set_simd(dom) : tempstring = tempstring + " ;;\n" tempstring = tempstring + " esac\n" tempstring = tempstring + " LV_CXXFLAGS=\"${LV_CXXFLAGS} ${ADDONS}\"\n" - tempstring = tempstring + " AM_CONDITIONAL(LV_HAVE_ORC, [test \"$LV_HAVE_ORC\" = \"yes\"])\n"; tempstring = tempstring + "])\n" return tempstring; diff --git a/volk/lib/Makefile.am b/volk/lib/Makefile.am index 6f3d7fd864..af7c7f3356 100644 --- a/volk/lib/Makefile.am +++ b/volk/lib/Makefile.am @@ -45,7 +45,7 @@ AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) \ # list of programs run by "make check" and "make distcheck" -TESTS = testqa +#TESTS = testqa #orc stuff gets built in the ORC directory conditional to ORC being enabled. #it gets linked in during the build of libvolk as an added library. #there might be a better way to do this. @@ -77,7 +77,7 @@ libvolk_la_SOURCES = \ volk_orc_LDFLAGS = \ $(ORC_LDFLAGS) \ -lorc-0.4 - + volk_orc_LIBADD = \ ../orc/libvolk_orc.la @@ -103,7 +103,6 @@ endif #libvolk_qa_la_LIBADD = \ # libvolk.la \ # libvolk_runtime.la - # ---------------------------------------------------------------- # headers that don't get installed |