diff options
| author | Tom Rondeau | 2011-04-08 15:37:29 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-04-08 15:37:29 -0400 |
| commit | 21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb (patch) | |
| tree | 4e72909a051b0a4ac428252d15f34b53bcc986b6 /volk/config | |
| parent | d7093fd06d0ec37f6ba2841d202fe90f4fa3661e (diff) | |
| parent | 5c358afd00347f5da7a59dd73ea79cd3df26659d (diff) | |
| download | gnuradio-21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb.tar.gz gnuradio-21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb.tar.bz2 gnuradio-21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb.zip | |
Merge branch 'master' into constell_obj
Conflicts:
gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
gr-audio-oss/src/Makefile.swig.gen
gr-audio/swig/Makefile.swig.gen
Diffstat (limited to 'volk/config')
| -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]) |