Browse Source

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

nfactor-troky
Con Kolivas 11 years ago
parent
commit
4f7b6fe4c3
  1. 2
      compat/Makefile.am
  2. 2
      configure.ac

2
compat/Makefile.am

@ -2,5 +2,7 @@
SUBDIRS = jansson-2.5 SUBDIRS = jansson-2.5
if WANT_USBUTILS if WANT_USBUTILS
if WANT_STATIC_LIBUSB
SUBDIRS += libusb-1.0 SUBDIRS += libusb-1.0
endif endif
endif

2
configure.ac

@ -368,6 +368,8 @@ else
LIBUSB_LIBS="" LIBUSB_LIBS=""
fi fi
AM_CONDITIONAL([WANT_STATIC_LIBUSB], [test x$dlibusb = xno])
AC_CONFIG_SUBDIRS([compat/jansson-2.5]) AC_CONFIG_SUBDIRS([compat/jansson-2.5])
JANSSON_LIBS="compat/jansson-2.5/src/.libs/libjansson.a" JANSSON_LIBS="compat/jansson-2.5/src/.libs/libjansson.a"

Loading…
Cancel
Save