r1445 - in trunk/src/host/dfu-util: . src

[mickey at sita.openmoko.org]

Author: mickey
Date: 2007-03-20 18:39:52 +0100 (Tue, 20 Mar 2007)
New Revision: 1445

Modified:
   trunk/src/host/dfu-util/configure.ac
   trunk/src/host/dfu-util/src/Makefile.am
Log:
dfu-util: use pkg-config to check for libusb


Modified: trunk/src/host/dfu-util/configure.ac
===================================================================
--- trunk/src/host/dfu-util/configure.ac	2007-03-20 17:14:11 UTC (rev 1444)
+++ trunk/src/host/dfu-util/configure.ac	2007-03-20 17:39:52 UTC (rev 1445)
@@ -14,12 +14,15 @@
 AC_PROG_CC
 
 # Checks for libraries.
-AC_CHECK_LIB([usb], [usb_control_msg],,
-                            [AC_MSG_ERROR([libusb not found])] )
 
+PKG_CHECK_MODULES(USB, libusb >= 0.1.4,,
+                 AC_MSG_ERROR([*** Required libusb >= 0.1.4 not installed ***]))
+LIBS="$LIBS $USB_LIBS"
+CFLAGS="$CFLAGS $USB_CFLAGS"
+
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([usb.h stdlib.h string.h stdio.h])
+AC_CHECK_HEADERS([stdlib.h string.h stdio.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST

Modified: trunk/src/host/dfu-util/src/Makefile.am
===================================================================
--- trunk/src/host/dfu-util/src/Makefile.am	2007-03-20 17:14:11 UTC (rev 1444)
+++ trunk/src/host/dfu-util/src/Makefile.am	2007-03-20 17:39:52 UTC (rev 1445)
@@ -1,10 +1,9 @@
 AM_CFLAGS = -Wall
 bin_PROGRAMS = dfu-util dfu-util_static
 dfu_util_SOURCES = main.c sam7dfu.c dfu.c dfu.h
-dfu_util_LDFLAGS = -lusb
 
 dfu_util_static_SOURCES = main.c sam7dfu.c dfu.c dfu.h
-dfu_util_static_LDFLAGS = -static -lusb
+dfu_util_static_LDFLAGS = -static
 
 # commands.c commands.h sam7dfu.c