diff options
| author | eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-10-01 23:11:11 +0000 |
|---|---|---|
| committer | eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-10-01 23:11:11 +0000 |
| commit | d497b054a51bc049640c1d43cb54ca3d54ffdb4a (patch) | |
| tree | 44076c93867e489e4af0358a9d2c924e7c0fc206 /config/grc_usrp2.m4 | |
| parent | 5bfda44b8d4093c81779c05c98f3bbd310f198df (diff) | |
Fixes ticket:297. Refactors how usrp2/firmware is built. Now
AC_CONFIG_SUBDIRS is always called, and there's a AM_CONDITIONAL in
usrp2/firmware that decides whether anything really gets built or not.
I think this will fix the "double cross" issue (cross-compiling the
bulk of this for cell while cross-compiling the usrp2 firmware at the
same time), though it's not tested yet.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9695 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'config/grc_usrp2.m4')
| -rw-r--r-- | config/grc_usrp2.m4 | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/config/grc_usrp2.m4 b/config/grc_usrp2.m4 index 71757bfce1..f7064c9168 100644 --- a/config/grc_usrp2.m4 +++ b/config/grc_usrp2.m4 @@ -20,6 +20,9 @@ dnl Boston, MA 02110-1301, USA. AC_DEFUN([GRC_USRP2],[ GRC_ENABLE(usrp2) + dnl firmware uses a subsidiary configure.ac + AC_CONFIG_SUBDIRS([usrp2/firmware]) + dnl Don't do usrp if omnithread or gruel is skipped GRC_CHECK_DEPENDENCY(usrp2, gruel) GRC_CHECK_DEPENDENCY(usrp2, omnithread) @@ -33,7 +36,6 @@ AC_DEFUN([GRC_USRP2],[ *) AC_MSG_RESULT([no]) AC_MSG_NOTICE([USRP2 currently requires Linux host OS, not found]) - AM_CONDITIONAL([BUILDING_USRP2_FIRMWARE],[0]) passed="no" ;; esac @@ -43,16 +45,6 @@ AC_DEFUN([GRC_USRP2],[ dnl yes : if the --enable code passed muster and all dependencies are met dnl no : otherwise if test $passed = yes; then - dnl Only do firmware if mb-gcc can be found - AC_CHECK_PROG([MB_GCC],[mb-gcc],[yes],[no]) - if test $MB_GCC = yes; then - dnl Adds usrp2/firmware to $(subdirs), hierarchical build - AC_CONFIG_SUBDIRS([usrp2/firmware]) - else - AC_MSG_WARN([usrp2/firmware is not being built]) - fi - AM_CONDITIONAL([BUILDING_USRP2_FIRMWARE],[test $MB_GCC = yes]) - dnl Needed for usrp2_socket_opener AC_CHECK_HEADERS(arpa/inet.h byteswap.h linux/if_packet.h sys/socket.h sys/un.h) AC_CHECK_MEMBERS([struct msghdr.msg_control, |