From 921682318259b63c04178e0a75b3dff85768c952 Mon Sep 17 00:00:00 2001
From: Nikolai Kondrashov <spbnick@gmail.com>
Date: Sun, 18 Dec 2011 15:52:26 +0200
Subject: Switch to using pkg-config

Switch to using pkg-config to locate libusb, update headers to include libusb.h
without subdirectory.
Thanks to Debian maintainers!
---
 configure.ac         | 7 +++----
 include/uhd/dev.h    | 4 ++--
 include/uhd/libusb.h | 4 ++--
 src/usbhid-dump.c    | 1 -
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index fd2920b..6018562 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,10 +48,9 @@ AC_PROG_LIBTOOL
 #
 # Checks for libraries.
 #
-AC_CHECK_LIB(
-    [usb-1.0], [libusb_init], [],
-    [AC_MSG_FAILURE([libusb is required, but was not found, abort.
-                     Try installing libusb-1.0-0-dev or libusb1-devel.])])
+PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.0)
+CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
+LIBS="$LIBS $LIBUSB_LIBS"
 
 #
 # Checks for features
diff --git a/include/uhd/dev.h b/include/uhd/dev.h
index 21775db..a97462a 100644
--- a/include/uhd/dev.h
+++ b/include/uhd/dev.h
@@ -1,7 +1,7 @@
 /** @file
  * @brief usbhid-dump - device
  *
- * Copyright (C) 2010 Nikolai Kondrashov
+ * Copyright (C) 2010-2011 Nikolai Kondrashov
  *
  * This file is part of usbhid-dump.
  *
@@ -28,7 +28,7 @@
 #define __UHD_DEV_H__
 
 #include <stdbool.h>
-#include <libusb-1.0/libusb.h>
+#include "uhd/libusb.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/uhd/libusb.h b/include/uhd/libusb.h
index 4334f2e..f64b6d9 100644
--- a/include/uhd/libusb.h
+++ b/include/uhd/libusb.h
@@ -1,7 +1,7 @@
 /** @file
  * @brief usbhid-dump - libusb API extensions
  *
- * Copyright (C) 2010 Nikolai Kondrashov
+ * Copyright (C) 2010-2011 Nikolai Kondrashov
  *
  * This file is part of usbhid-dump.
  *
@@ -27,7 +27,7 @@
 #ifndef __UHD_LIBUSB_H__
 #define __UHD_LIBUSB_H__
 
-#include <libusb-1.0/libusb.h>
+#include <libusb.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/usbhid-dump.c b/src/usbhid-dump.c
index e12aaf0..dab371d 100644
--- a/src/usbhid-dump.c
+++ b/src/usbhid-dump.c
@@ -39,7 +39,6 @@
 #include <unistd.h>
 #include <getopt.h>
 #include <stdio.h>
-#include <libusb-1.0/libusb.h>
 
 #include "config.h"
 
-- 
cgit v1.2.1