diff options
| author | Johnathan Corgan | 2010-04-26 09:13:17 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-04-26 09:13:17 -0700 |
| commit | 1eb2ad3909a0ba16e8c03776d1d26693b9b152a5 (patch) | |
| tree | 289eeb68d9281b0b99c999d4c6f89621f3efc45f /config | |
| parent | a712b478c2824396408b2ec11584b7d559015b25 (diff) | |
| download | gnuradio-1eb2ad3909a0ba16e8c03776d1d26693b9b152a5.tar.gz gnuradio-1eb2ad3909a0ba16e8c03776d1d26693b9b152a5.tar.bz2 gnuradio-1eb2ad3909a0ba16e8c03776d1d26693b9b152a5.zip | |
Update build configuration for OSX omnithreads changeover
gr-audio-osx now depends on gruel (via gnuradio-core) vs. omnithreads
usrp now depends on gruel vs. omnithreads
Boost base library dependency has been upped to 1.37 for
Darwin only, for Darwin specific code in usrp host library
Diffstat (limited to 'config')
| -rw-r--r-- | config/grc_gr_audio_osx.m4 | 5 | ||||
| -rw-r--r-- | config/grc_usrp.m4 | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/config/grc_gr_audio_osx.m4 b/config/grc_gr_audio_osx.m4 index 95fbc17d5..df8634ff6 100644 --- a/config/grc_gr_audio_osx.m4 +++ b/config/grc_gr_audio_osx.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2010 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -20,8 +20,7 @@ dnl Boston, MA 02110-1301, USA. AC_DEFUN([GRC_GR_AUDIO_OSX],[ GRC_ENABLE(gr-audio-osx) - dnl Don't do gr-audio-osx if omnithread or gnuradio-core skipped - GRC_CHECK_DEPENDENCY(gr-audio-osx, omnithread) + dnl Don't do gr-audio-osx if gnuradio-core skipped GRC_CHECK_DEPENDENCY(gr-audio-osx, gnuradio-core) dnl If execution gets to here, $passed will be: diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4 index 286641928..1bebfc5b9 100644 --- a/config/grc_usrp.m4 +++ b/config/grc_usrp.m4 @@ -22,8 +22,8 @@ AC_DEFUN([GRC_USRP],[ GRC_WITH(usrp) - dnl Don't do usrp if omnithread skipped - GRC_CHECK_DEPENDENCY(usrp, omnithread) + dnl Don't do usrp if gruel is skipped + GRC_CHECK_DEPENDENCY(usrp, gruel) dnl Make sure the fast usb technique is set, OS dependent. dnl This is always performed, since it puts out CLI flags. |