X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=config%2Fusrp_libusb.m4;h=673fa994d0e54600117cba975767e3479d423825;hb=0cd478fdc090123e09b7ee21c88e5657abab8ae0;hp=9f670144fa4bc9e061efffac5a8fd245d50c5dd1;hpb=5d69a524f81f234b3fbc41d49ba18d6f6886baba;p=debian%2Fgnuradio

diff --git a/config/usrp_libusb.m4 b/config/usrp_libusb.m4
index 9f670144..673fa994 100644
--- a/config/usrp_libusb.m4
+++ b/config/usrp_libusb.m4
@@ -1,51 +1,64 @@
-# Check for libusb support.             		-*- Autoconf -*-
+dnl Copyright 2003,2008,2009 Free Software Foundation, Inc.
+dnl 
+dnl This file is part of GNU Radio
+dnl 
+dnl GNU Radio is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 3, or (at your option)
+dnl any later version.
+dnl 
+dnl GNU Radio is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with GNU Radio; see the file COPYING.  If not, write to
+dnl the Free Software Foundation, Inc., 51 Franklin Street,
+dnl Boston, MA 02110-1301, USA.
 
-# Copyright 2003 Free Software Foundation, Inc.
+# $1 is $req_libusb1:
+#   yes : check libusb-1.0
+#   no  : check libusb-0.12
+#   ""  : check libusb-0.12
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+AC_DEFUN([USRP_LIBUSB], [
+  libusbok=yes
+  have_libusb1=no
+  if test [x]$1 = xyes; then
+    PKG_CHECK_MODULES(USB, libusb-1.0, [have_libusb1=yes], [
+      AC_LANG_PUSH(C)
+      AC_CHECK_HEADERS([libusb-1.0/libusb.h], [have_libusb1=yes],
+                       [libusbok=no; AC_MSG_RESULT([USRP requires libusb-1.0. libusb.h not found. See http://www.libusb.org])])
+      AC_SEARCH_LIBS(libusb_bulk_transfer, [usb], [USB_LIBS="$LIBS"],
+                     [libusbok=no; AC_MSG_RESULT([USRP requires libusb-1.0. libusb_bulk_transfer not found. See http://www.libusb.org])])
+      AC_LANG_POP
+    ])
+  else
+    PKG_CHECK_MODULES(USB, libusb, [], [
+      AC_LANG_PUSH(C)
+      AC_CHECK_HEADERS([usb.h], [],
+                       [libusbok=no; AC_MSG_RESULT([USRP requires libusb. usb.h not found. See http://www.libusb.org])])
+      save_LIBS="$LIBS"
+      case "$host_os" in
+        darwin*)
+          LIBS="$LIBS -lIOKit"
+          ;;
+        *) ;;
+      esac
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+      AC_SEARCH_LIBS(usb_bulk_write, [usb], [USB_LIBS="$LIBS"],
+                     [libusbok=no; AC_MSG_RESULT([USRP requires libusb. usb_bulk_write not found. See http://www.libusb.org])])
+      LIBS="$save_LIBS"
+      AC_LANG_POP
+    ])
+  fi
 
-AC_DEFUN([USRP_LIBUSB],
-[
-	AC_LANG_PUSH(C)
-
-	libusbok=yes
-	AC_CHECK_HEADERS([usb.h],
-	  [],
-	  [libusbok=no, 
-	   AC_MSG_RESULT([USRP requires libusb. usb.h not found. See http://libusb.sf.net])]
-	)
-
-        save_LIBS="$LIBS"
-	case "$host_os" in
-	    darwin*)    LIBS="$LIBS -lIOKit" ;;
-	    *) ;;
-	esac
-	AC_SEARCH_LIBS(usb_bulk_write, [usb],
-	  [USB_LIBS="$LIBS"],
-	  [libusbok=no,
-	   AC_MSG_RESULT([USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net])]
-	)
-        LIBS="$save_LIBS"
-
-	AC_LANG_POP
-
-	if test $libusbok = yes; then
-	    AC_SUBST(USB_LIBS)
-	    ifelse([$1], , :, [$1])
-	else
-	    ifelse([$2], , :, [$2])
-	fi
+  if test x$libusbok = xyes; then
+    AC_SUBST(USB_LIBS)
+    ifelse([$2], , :, [$2])
+  else
+    ifelse([$3], , :, [$3])
+  fi
 ])