Updated gr-howto-write-a-block; mostly the .m4 macros and configure.ac.

Also modified pkg.m4 to restore the FOO_INCLUDEDIR functionality and
to add the FOO_CPPFLAGS variable for those times when you want only
the -I, -D and -U flags from FOO_CFLAGS.


git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9362 221aa14e-8319-0410-a670-987f0aec2ac5

1 files changed, 43 insertions, 38 deletions

diff --git a/gr-howto-write-a-block/config/usrp_libusb.m4 b/gr-howto-write-a-block/config/usrp_libusb.m4
index 9fe4753e6..cb3130c87 100644
--- a/gr-howto-write-a-block/config/usrp_libusb.m4
+++ b/gr-howto-write-a-block/config/usrp_libusb.m4
@@ -1,43 +1,48 @@
-# Check for libusb support.             		-*- Autoconf -*-
-
-# Copyright 2003 Free Software Foundation, Inc.
-
-# 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 3, 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.
-
-# 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., 51 Franklin Street, Boston, MA
-# 02110-1301, USA.
-
-AC_DEFUN([USRP_LIBUSB],
-[
-	AC_REQUIRE([AC_CANONICAL_HOST])
-	AC_LANG_PUSH(C)
+dnl Copyright 2003,2008 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.
+
+AC_DEFUN([USRP_LIBUSB], [
+    libusbok=yes
+    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://libusb.sf.net])])
+
+	save_LIBS="$LIBS"
+	case "$host_os" in
+	  darwin*)
+	    LIBS="$LIBS -lIOKit"
+            ;;
+	  *) ;;
+        esac
 
-	AC_CHECK_HEADERS([usb.h],
-	  [],
-	  [ AC_MSG_ERROR([USRP requires libusb. usb.h not found, stop. See http://libusb.sf.net]) ]
-	)
+	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])])
 
-        save_LIBS="$LIBS"
-	case "$host_os" in
-	    darwin*)    LIBS="$LIBS -lIOKit" ;;
-	    *) ;;
-	esac
-	AC_SEARCH_LIBS(usb_bulk_write, [usb],
-	  [ USB_LIBS="$LIBS" ],
-	  [ AC_MSG_ERROR([USRP requires libusb. usb_bulk_write not found, stop. See http://libusb.sf.net]) ]
-	)
         LIBS="$save_LIBS"
 
-	AC_LANG_POP
-	AC_SUBST(USB_LIBS)
+        AC_LANG_POP
+    ])
+
+    if test x$libusbok = xyes; then
+        AC_SUBST(USB_LIBS)
+	ifelse([$1], , :, [$1])
+    else
+        ifelse([$2], , :, [$2])
+    fi
 ])