3 files changed, 12 insertions, 3 deletions
diff --git a/volk/config/gcc_version_workaround.m4 b/volk/config/gcc_version_workaround.m4
index b3ba0b6f3..3cd8a0cc7 100644..100755
--- a/volk/config/gcc_version_workaround.m4
+++ b/volk/config/gcc_version_workaround.m4
@@ -1,5 +1,9 @@
 AC_DEFUN([LV_GCC_VERSION_WORKAROUND], 
 [
+    case "${host_os}" in
+      *cygwin*)
+      ;;
+      *)
 	AC_REQUIRE([LF_CONFIGURE_CXX])
 	
 	cxx_version=`$CXX --version`
@@ -44,6 +48,6 @@ AC_DEFUN([LV_GCC_VERSION_WORKAROUND],
 	
 	fi
     	
-	
+    esac
 
 	])
 \ No newline at end of file
diff --git a/volk/config/lv_configure.m4 b/volk/config/lv_configure.m4
index f98b2dc5b..dfa490cdf 100644..100755
--- a/volk/config/lv_configure.m4
+++ b/volk/config/lv_configure.m4
@@ -98,12 +98,13 @@ dnl  AM_CONDITIONAL([USE_PYTHON], [test "$with_python" = yes])
 
   dnl Check for Mingw support
   GR_PWIN32
-  GR_LIBGNURADIO_CORE_EXTRA_LDFLAGS
+  dnl GR_LIBGNURADIO_CORE_EXTRA_LDFLAGS
   
   dnl Check for liborc
   ORC_CHECK
   
-  LDFLAGS="$LDFLAGS $LIBGNURADIO_CORE_EXTRA_LDFLAGS"
+  dnl Following causes test for -lboost_unit_test_framework to fail on Cygwin
+  dnl LDFLAGS="$LDFLAGS $LIBGNURADIO_CORE_EXTRA_LDFLAGS"
 
   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 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],