diff options
| author | Don Ward | 2011-03-05 20:22:36 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2011-03-05 20:22:36 -0500 |
| commit | 942e26851291e023dabf372b7dc38bd089dbd237 (patch) | |
| tree | aa061999f21c3c2d915a93efbd91ed52484cd399 | |
| parent | 75538e12300cb0d593792a986841ba2df9997c54 (diff) | |
| download | gnuradio-942e26851291e023dabf372b7dc38bd089dbd237.tar.gz gnuradio-942e26851291e023dabf372b7dc38bd089dbd237.tar.bz2 gnuradio-942e26851291e023dabf372b7dc38bd089dbd237.zip | |
volk: fixing configuration for Cygwin builds.
| -rwxr-xr-x[-rw-r--r--] | volk/config/gcc_version_workaround.m4 | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | volk/config/lv_configure.m4 | 5 |
2 files changed, 8 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]) |