From 4f7b6fe4c3b810307bda2c78a57d25406976fad9 Mon Sep 17 00:00:00 2001
From: Con Kolivas <kernel@kolivas.org>
Date: Wed, 23 Oct 2013 22:40:13 +1100
Subject: [PATCH] Avoid entering static libusb directory if
 --with-system-libusb is enabled.

---
 compat/Makefile.am | 2 ++
 configure.ac       | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/compat/Makefile.am b/compat/Makefile.am
index 4ed10f82..4cd32d2a 100644
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@@ -2,5 +2,7 @@
 SUBDIRS	= jansson-2.5
 
 if WANT_USBUTILS
+if WANT_STATIC_LIBUSB
 SUBDIRS += libusb-1.0
 endif
+endif
diff --git a/configure.ac b/configure.ac
index 8a505da2..f6fa7859 100644
--- a/configure.ac
+++ b/configure.ac
@@ -368,6 +368,8 @@ else
 	LIBUSB_LIBS=""
 fi
 
+AM_CONDITIONAL([WANT_STATIC_LIBUSB], [test x$dlibusb = xno])
+
 AC_CONFIG_SUBDIRS([compat/jansson-2.5])
 JANSSON_LIBS="compat/jansson-2.5/src/.libs/libjansson.a"