Avoid entering static libusb directory if --with-system-libusb is enabled.

11 years ago · 4f7b6fe4c3
2 changed files with 4 additions and 0 deletions
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@ -2,5 +2,7 @@
				@@ -2,5 +2,7 @@
 SUBDIRS	= jansson-2.5

 if WANT_USBUTILS
+if WANT_STATIC_LIBUSB
 SUBDIRS += libusb-1.0
 endif
+endif
--- a/configure.ac
+++ b/configure.ac
@ -368,6 +368,8 @@ else
				@@ -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"