Volk: More autotools stuff for Orc. Should build OK with or without Orc now.

6 files changed, 31 insertions, 14 deletions

diff --git a/volk/Makefile.am b/volk/Makefile.am
index 608aa2e27..d1ebdc78d 100644
--- a/volk/Makefile.am
+++ b/volk/Makefile.am
@@ -24,7 +24,12 @@ ACLOCAL_AMFLAGS = -I config
 include $(top_srcdir)/Makefile.common
 
 EXTRA_DIST = bootstrap configure config.h.in volk_config.h
-SUBDIRS = config orc include lib
+SUBDIRS = config
+if HAVE_ORC
+SUBDIRS += orc
+endif
+SUBDIRS += include lib
+
 #if USE_PYTHON
 #SUBDIRS += python 
 #endif
diff --git a/volk/config/lv_configure.m4 b/volk/config/lv_configure.m4
index 47ad543f8..f98b2dc5b 100644
--- a/volk/config/lv_configure.m4
+++ b/volk/config/lv_configure.m4
@@ -104,10 +104,6 @@ dnl  AM_CONDITIONAL([USE_PYTHON], [test "$with_python" = yes])
   ORC_CHECK
   
   LDFLAGS="$LDFLAGS $LIBGNURADIO_CORE_EXTRA_LDFLAGS"
-  
-  if test HAVE_ORC = true; then
-    LDFLAGS="$LDFLAGS $ORC_LDFLAGS"
-  fi
 
   AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])
   AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes])
diff --git a/volk/config/orc.m4 b/volk/config/orc.m4
index 03c12a8f9..fa48b10df 100644
--- a/volk/config/orc.m4
+++ b/volk/config/orc.m4
@@ -45,7 +45,6 @@ AC_DEFUN([ORC_CHECK],
     AC_DEFINE(DISABLE_ORC, 1, [Disable Orc])
     HAVE_ORC=no
     HAVE_ORCC=no
-    ORC_LDFLAGS=""
   fi
   AM_CONDITIONAL(HAVE_ORC, [test "x$HAVE_ORC" = "xyes"])
   AM_CONDITIONAL(HAVE_ORCC, [test "x$HAVE_ORCC" = "xyes"])
diff --git a/volk/configure.ac b/volk/configure.ac
index 8e2f5b8b9..5a1eac3f2 100644
--- a/volk/configure.ac
+++ b/volk/configure.ac
@@ -76,9 +76,12 @@ 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 e568aebfa..78a00476d 100644
--- a/volk/include/volk/make_set_simd.py
+++ b/volk/include/volk/make_set_simd.py
@@ -183,8 +183,14 @@ def make_set_simd(dom) :
             tempstring = tempstring + "    indCXX=no\n"
             tempstring = tempstring + "    indLV_ARCH=no\n"
         elif atype == "all":
-            tempstring = tempstring + "      AC_DEFINE(LV_HAVE_" + arch.swapcase() + ", 1, [" + arch + " flag set])\n";
-            tempstring = tempstring + "      LV_HAVE_" + arch.swapcase() + "=yes\n";
+            if arch == "orc":
+                tempstring = tempstring + "      if test $HAVE_ORC = yes; then\n";
+                tempstring = tempstring + "      AC_DEFINE(LV_HAVE_" + arch.swapcase() + ", 1, [" + arch + " flag set])\n";
+                tempstring = tempstring + "      LV_HAVE_" + arch.swapcase() + "=yes\n";
+                tempstring = tempstring + "      fi\n";
+            else:
+                tempstring = tempstring + "      AC_DEFINE(LV_HAVE_" + arch.swapcase() + ", 1, [" + arch + " flag set])\n";
+                tempstring = tempstring + "      LV_HAVE_" + arch.swapcase() + "=yes\n";
     tempstring = tempstring + "  ;;\n"
         
     tempstring = tempstring + "  (powerpc)\n"
diff --git a/volk/lib/Makefile.am b/volk/lib/Makefile.am
index 649d461e0..385401ae1 100644
--- a/volk/lib/Makefile.am
+++ b/volk/lib/Makefile.am
@@ -138,10 +138,13 @@ endif
 
 
 
-libvolk_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 $(ORC_LDFLAGS) -lorc-0.4
-libvolk_runtime_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 $(ORC_LDFLAGS) -lorc-0.4
+libvolk_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
+libvolk_runtime_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
+if HAVE_ORC
 libvolk_la_LIBADD = ../orc/libvolk_orc.la
-
+libvolk_la_LDFLAGS += -lorc-0.4
+libvolk_runtime_la_LDFLAGS += -lorc-0.4
+endif
 
 
 # ----------------------------------------------------------------
@@ -237,13 +240,18 @@ libvolk_qa_la_SOURCES = \
 	qa_32f_stddev_aligned16.cc \
 	qa_32f_stddev_and_mean_aligned16.cc
 
-libvolk_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 $(ORC_LDFLAGS) -lorc-0.4
+libvolk_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
 
 libvolk_qa_la_LIBADD = \
 	libvolk.la \
 	libvolk_runtime.la \
-	../orc/libvolk_orc.la \
 	$(CPPUNIT_LIBS)
+	
+if HAVE_ORC
+libvolk_qa_la_LIBADD += \
+    ../orc/libvolk_orc.la
+    libvolk_qa_la_LDFLAGS += -lorc-0.4
+endif
 
 # ----------------------------------------------------------------
 # headers that don't get installed