volk: Properly sets up package config script if Orc is not found for …

…Volk.
Ka-zam · Feb 17, 2011 · 2e67c13 · 2e67c13
1 parent f939848
commit 2e67c13
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/config/orc.m4 b/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.pc.in b/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}