aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTormod Volden <debian.tormod@gmail.com>2024-01-28 23:35:16 +0100
committerTormod Volden <debian.tormod@gmail.com>2024-01-31 12:32:18 +0100
commitfdff3cd395dd5cfbe2a730b02b64d977e78134cd (patch)
tree8654e5fd20f8d0c3a6a1b1d7608043cd0278fa18
parent2fad5a8b1b2d0789e3065126b3607fb1a55cc3f5 (diff)
downloadlibusb-fdff3cd395dd5cfbe2a730b02b64d977e78134cd.tar.gz
configure.ac: Do not build umockdev if --enable-debug-log is used
umockdev relies on the per-context log callbacks to do its checks properly, and these are not called if ENABLE_DEBUG_LOGGING is defined (configure --enable-debug-log). Fixes #1449 Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
-rw-r--r--configure.ac2
-rw-r--r--libusb/version_nano.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index e578f65..4ec3116 100644
--- a/configure.ac
+++ b/configure.ac
@@ -383,7 +383,7 @@ AC_ARG_ENABLE([tests-build],
AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$build_examples" != xno])
AM_CONDITIONAL([BUILD_TESTS], [test "x$build_tests" != xno])
-AM_CONDITIONAL([BUILD_UMOCKDEV_TEST], [test "x$ac_have_umockdev" = xyes -a "x$log_enabled" != xno])
+AM_CONDITIONAL([BUILD_UMOCKDEV_TEST], [test "x$ac_have_umockdev" = xyes -a "x$log_enabled" != xno -a "x$debug_log_enabled" != xyes])
AM_CONDITIONAL([CREATE_IMPORT_LIB], [test "x$create_import_lib" = xyes])
AM_CONDITIONAL([OS_DARWIN], [test "x$backend" = xdarwin])
AM_CONDITIONAL([OS_HAIKU], [test "x$backend" = xhaiku])
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 37a12f6..1890e36 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11878
+#define LIBUSB_NANO 11879