diff options
| author | Tom Rondeau | 2011-02-17 15:48:41 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2011-02-17 15:48:41 -0500 |
| commit | ca64a7a905b1a5fa5e74dd730591f0f7e0ff3929 (patch) | |
| tree | add9788e742b641423a7576e70ee77b45d54072d | |
| parent | ff5f0ed3b609cecf8becf8eb3d518a3ecf7fecef (diff) | |
| download | gnuradio-ca64a7a905b1a5fa5e74dd730591f0f7e0ff3929.tar.gz gnuradio-ca64a7a905b1a5fa5e74dd730591f0f7e0ff3929.tar.bz2 gnuradio-ca64a7a905b1a5fa5e74dd730591f0f7e0ff3929.zip | |
volk: Properly sets up package config script if Orc is not found for Volk.
| -rw-r--r-- | volk/config/orc.m4 | 4 | ||||
| -rw-r--r-- | volk/volk.pc.in | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/volk/config/orc.m4 b/volk/config/orc.m4 index df0f3d6f3..d17160a9a 100644 --- a/volk/config/orc.m4 +++ b/volk/config/orc.m4 @@ -22,6 +22,7 @@ AC_DEFUN([ORC_CHECK], AC_SUBST(ORC_CFLAGS) LV_HAVE_ORC=yes LV_HAVE_ORCC=yes + LV_ORC_PKGCONFIG="-lvolk_orc" if test "x$cross_compiling" = "xyes" ; then LV_HAVE_ORCC=no fi @@ -32,14 +33,17 @@ AC_DEFUN([ORC_CHECK], AC_DEFINE(DISABLE_ORC, 1, [Disable Orc]) LV_HAVE_ORC=no LV_HAVE_ORCC=no + LV_ORC_PKGCONFIG="" ]) else AC_DEFINE(DISABLE_ORC, 1, [Disable Orc]) LV_HAVE_ORC=no LV_HAVE_ORCC=no + LV_ORC_PKGCONFIG="" fi AM_CONDITIONAL(LV_HAVE_ORC, [test "x$LV_HAVE_ORC" = "xyes"]) AM_CONDITIONAL(LV_HAVE_ORCC, [test "x$LV_HAVE_ORCC" = "xyes"]) + AC_SUBST(LV_ORC_PKGCONFIG) ])) AC_DEFUN([ORC_OUTPUT], diff --git a/volk/volk.pc.in b/volk/volk.pc.in index b03dbdada..85425ba64 100644 --- a/volk/volk.pc.in +++ b/volk/volk.pc.in @@ -10,6 +10,6 @@ Name: volk Description: VOLK.. Vector Optimized Library of Kernels Requires: Version: @VERSION@ -Libs: -lvolk -lvolk_runtime -lvolk_orc +Libs: -lvolk -lvolk_runtime @LV_ORC_PKGCONFIG@ Cflags: -I${includedir} ${LV_CXXFLAGS} |