serial: introduce more general "have serial comm" feature flag

[libsigrok.git] / src / backend.c

diff --git a/src/backend.c b/src/backend.c
index c8784f54fec3d9b925ff97c7de897ac8fff4beef..a5d5749bcd51e24ba04d5571fb8f6113ad98a557 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -153,8 +153,14 @@ SR_API GSList *sr_buildinfo_libs_get(void)
        m = g_slist_append(m, g_strdup_printf("%s", CONF_LIBUSB_1_0_VERSION));
 #else
        lv = libusb_get_version();
-       m = g_slist_append(m, g_strdup_printf("%d.%d.%d.%d%s",
-               lv->major, lv->minor, lv->micro, lv->nano, lv->rc));
+       m = g_slist_append(m, g_strdup_printf("%d.%d.%d.%d%s API 0x%08x",
+               lv->major, lv->minor, lv->micro, lv->nano, lv->rc,
+#if defined(LIBUSB_API_VERSION)
+               LIBUSB_API_VERSION
+#elif defined(LIBUSBX_API_VERSION)
+               LIBUSBX_API_VERSION
+#endif
+               ));
 #endif
        l = g_slist_append(l, m);
 #endif
@@ -199,7 +205,7 @@ SR_API char *sr_buildinfo_scpi_backends_get(void)
 #if HAVE_RPC
        g_string_append_printf(s, "RPC, ");
 #endif
-#ifdef HAVE_LIBSERIALPORT
+#ifdef HAVE_SERIAL_COMM
        g_string_append_printf(s, "serial, ");
 #endif
 #ifdef HAVE_LIBREVISA
@@ -226,8 +232,7 @@ static void print_versions(void)
        char *str;
        const char *lib, *version;
 
-       sr_dbg("libsigrok %s/%s (rt: %s/%s).",
-               SR_PACKAGE_VERSION_STRING, SR_LIB_VERSION_STRING,
+       sr_dbg("libsigrok %s/%s.",
                sr_package_version_string_get(), sr_lib_version_string_get());
 
        s = g_string_sized_new(200);