better (read: real) fix for ticket:15

[debian/gnuradio] / config / grc_usrp.m4

diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4
index 85e7f31feff97478961030367ae26e90998f8c46..5ef847a445375308aeb3a08dc183cbc3b279ddb9 100644 (file)
--- a/config/grc_usrp.m4
+++ b/config/grc_usrp.m4
@@ -68,14 +68,19 @@ AC_DEFUN([GRC_USRP],[
 
     if test $succeeded = yes; then
        dnl Define where to look for USRP includes
-       USRP_INCLUDES='-I$(top_srcdir)/host/lib -I$(top_srcdir)/firmware/include'
+       USRP_INCLUDES='-I$(top_srcdir)/usrp/host/lib -I$(top_srcdir)/usrp/firmware/include'
        AC_SUBST(USRP_INCLUDES)
 
         USRP_DEFINES=''
         AC_SUBST(USRP_DEFINES)
 
-        DEFINES="$USRP_DEFINES"
-        AC_SUBST(DEFINES)
+       dnl Define where to find USRP library
+       USRP_LIBS='-L$(top_builddir)/usrp/host/lib -lusrp'
+       AC_SUBST(USRP_LIBS)
+
+       dnl FIXME this looked very suspicious
+        dnl DEFINES="$USRP_DEFINES"
+        dnl AC_SUBST(DEFINES)
 
        subdirs="$subdirs usrp"
     else