projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: update version number to 3.3.1
[debian/gnuradio]
/
config
/
grc_usrp2.m4
diff --git
a/config/grc_usrp2.m4
b/config/grc_usrp2.m4
index f842a79a6cf84dd9eae3202cabc22664721eca55..701b100ad98a3c7e5f91c2eb8870644ed146aa33 100644
(file)
--- a/
config/grc_usrp2.m4
+++ b/
config/grc_usrp2.m4
@@
-1,4
+1,4
@@
-dnl Copyright 2008 Free Software Foundation, Inc.
+dnl Copyright 2008
,2010
Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Radio
dnl
dnl
dnl This file is part of GNU Radio
dnl
@@
-20,19
+20,21
@@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_USRP2],[
GRC_ENABLE(usrp2)
AC_DEFUN([GRC_USRP2],[
GRC_ENABLE(usrp2)
- dnl Don't do usrp if omnithread or gruel is skipped
+ dnl firmware uses a subsidiary configure.ac
+ AC_CONFIG_SUBDIRS([usrp2/firmware])
+
+ dnl Don't do usrp if gruel is skipped
GRC_CHECK_DEPENDENCY(usrp2, gruel)
GRC_CHECK_DEPENDENCY(usrp2, gruel)
- GRC_CHECK_DEPENDENCY(usrp2, omnithread)
dnl USRP2 host code only works on Linux at the moment
dnl USRP2 host code only works on Linux at the moment
- AC_MSG_CHECKING([whether host_
cpu
is linux*])
+ AC_MSG_CHECKING([whether host_
os
is linux*])
case "$host_os" in
linux*)
case "$host_os" in
linux*)
- AC_MSG_RESULT(
"yes"
)
+ AC_MSG_RESULT(
[yes]
)
;;
*)
;;
*)
- AC_MSG_RESULT(
"no"
)
- echo "USRP2 requires Linux host OS, not found"
+ AC_MSG_RESULT(
[no]
)
+ AC_MSG_NOTICE([USRP2 currently requires Linux host OS, not found])
passed="no"
;;
esac
passed="no"
;;
esac
@@
-42,13
+44,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 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])
- fi
-
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,
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,