From 942e26851291e023dabf372b7dc38bd089dbd237 Mon Sep 17 00:00:00 2001
From: Don Ward
Date: Sat, 5 Mar 2011 20:22:36 -0500
Subject: volk: fixing configuration for Cygwin builds.

---
 volk/config/gcc_version_workaround.m4 | 6 +++++-
 volk/config/lv_configure.m4           | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 volk/config/gcc_version_workaround.m4
 mode change 100644 => 100755 volk/config/lv_configure.m4

(limited to 'volk/config')

diff --git a/volk/config/gcc_version_workaround.m4 b/volk/config/gcc_version_workaround.m4
old mode 100644
new mode 100755
index b3ba0b6f3..3cd8a0cc7
--- 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
old mode 100644
new mode 100755
index f98b2dc5b..dfa490cdf
--- 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])
-- 
cgit