From f43c472952f6475eb9b6ef8e64a85f65c044a939 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 30 Aug 2010 22:03:42 +0000 Subject: [PATCH] fix some thinkos in libusb cleanup git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1844 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- urjtag/configure.ac | 3 +++ 1 file changed, 3 insertions(+) diff --git a/urjtag/configure.ac b/urjtag/configure.ac index a1a58e39..26e627f4 100644 --- a/urjtag/configure.ac +++ b/urjtag/configure.ac @@ -182,6 +182,7 @@ AS_IF([test "x$with_libusb" != xno], [ ], [ AS_IF([test "x$with_libusb" != x0.1 -a "x$HAVELIBUSB" = xno], [ PKG_CHECK_MODULES(LIBUSB, libusb-1.0, [HAVELIBUSB=1.0], [:]) + AC_DEFINE(HAVE_LIBUSB1, 1, [Define if you have libusb-1.0]) ]) AS_IF([test "x$with_libusb" != x1.0 -a "x$HAVELIBUSB" = xno], [ PKG_CHECK_MODULES(LIBUSB, libusb, [HAVELIBUSB=0.1], [:]) @@ -196,6 +197,8 @@ AS_IF([test "x$with_libusb" != xno], [ AC_DEFINE(HAVE_LIBUSB, 1, [Define if you have libusb]) ]) ]) + AS_VAR_APPEND([LIBS], " $LIBUSB_LIBS") + AS_VAR_APPEND([CPPFLAGS], " $LIBUSB_CFLAGS") ]) AM_CONDITIONAL(HAVE_LIBUSB, [test "x$HAVELIBUSB" != "xno"])