[Commit-gnuradio] r9517 - in gnuradio/branches/features/gr-usrp2: . config

[jcorgan]

Author: jcorgan
Date: 2008-09-07 12:06:15 -0600 (Sun, 07 Sep 2008)
New Revision: 9517

Modified:
   gnuradio/branches/features/gr-usrp2/config/grc_usrp2.m4
   gnuradio/branches/features/gr-usrp2/configure.ac
Log:
Move usrp2 specific config checks into grc_usrp2.m4

Modified: gnuradio/branches/features/gr-usrp2/config/grc_usrp2.m4
===================================================================
--- gnuradio/branches/features/gr-usrp2/config/grc_usrp2.m4     2008-09-07 
08:20:22 UTC (rev 9516)
+++ gnuradio/branches/features/gr-usrp2/config/grc_usrp2.m4     2008-09-07 
18:06:15 UTC (rev 9517)
@@ -29,7 +29,20 @@
     dnl   yes  : if the --enable code passed muster and all dependencies are 
met
     dnl   no   : otherwise
     if test $passed = yes; then
+       dnl Adds usrp2/firmware to $(subdirs), hierarchical build
        AC_CONFIG_SUBDIRS([usrp2/firmware])
+
+       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,
+                         struct msghdr.msg_accrights,
+                         struct cmsgcred.cmcred_uid,
+                         struct ucred.uid],
+                        [],[],
+                        [#define __USE_GNU 1
+                         #include <sys/types.h>
+                         #include <sys/socket.h>
+                         #include <sys/un.h>])
     fi
     if test $passed != with; then
        dnl how and where to find INCLUDES and LA

Modified: gnuradio/branches/features/gr-usrp2/configure.ac
===================================================================
--- gnuradio/branches/features/gr-usrp2/configure.ac    2008-09-07 08:20:22 UTC 
(rev 9516)
+++ gnuradio/branches/features/gr-usrp2/configure.ac    2008-09-07 18:06:15 UTC 
(rev 9517)
@@ -135,7 +135,6 @@
 AC_CHECK_HEADERS(fcntl.h limits.h strings.h time.h sys/ioctl.h sys/time.h 
unistd.h)
 AC_CHECK_HEADERS(linux/ppdev.h dev/ppbus/ppi.h sys/mman.h sys/select.h 
sys/types.h)
 AC_CHECK_HEADERS(sys/resource.h stdint.h sched.h signal.h sys/syscall.h)
-AC_CHECK_HEADERS(arpa/inet.h byteswap.h linux/if_packet.h sys/socket.h 
sys/un.h)
 AC_CHECK_HEADERS(netinet/in.h)
 AC_CHECK_HEADERS(windows.h)
 
@@ -148,16 +147,6 @@
 AC_SUBST(GR_ARCH_BIGENDIAN)
 AC_STRUCT_TM
 
-AC_CHECK_MEMBERS([struct msghdr.msg_control,
-                 struct msghdr.msg_accrights,
-                 struct cmsgcred.cmcred_uid,
-                 struct ucred.uid],
-                 [],[],
-                [#define __USE_GNU 1
-                 #include <sys/types.h>
-                 #include <sys/socket.h>
-                 #include <sys/un.h>])
-
 dnl Checks for library functions.
 AC_FUNC_ALLOCA
 AC_FUNC_SETVBUF_REVERSED