X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=c75de749a058657e0d55b61e038aa8620e0a23ac;hb=8006cdc53d4f52f055559b95986b13c3c3826745;hp=f283ca00560960cb20389fcfff24f715c0fa8f24;hpb=e662d9e8e5c6a5d677194fc217da3a88040387a3;p=libsigrok.git diff --git a/configure.ac b/configure.ac index f283ca00..c75de749 100644 --- a/configure.ac +++ b/configure.ac @@ -73,7 +73,7 @@ SR_PKG_CHECK_SUMMARY([sr_pkglibs_summary]) # These are used to derive the compiler flags and for the "Requires.private" # field in the generated libsigrok.pc file. SR_VAR_OPT_PKG([SR_PKGLIBS], [sr_deps_avail]) -SR_PKGLIBS_CHECK= +SR_PKGLIBS_TESTS= SR_PKGLIBS_CXX= SR_PKGLIBS_PYTHON= @@ -101,7 +101,7 @@ SR_ARG_OPT_PKG([libgpib], [LIBGPIB], [NEED_GPIB], ###################### # The Check unit testing framework is optional. Disable if not found. -SR_PKG_CHECK([check], [SR_PKGLIBS_CHECK], [check >= 0.9.4]) +SR_PKG_CHECK([check], [SR_PKGLIBS_TESTS], [check >= 0.9.4]) AM_CONDITIONAL([HAVE_CHECK], [test "x$sr_have_check" = xyes]) AC_LANG([C]) @@ -205,6 +205,7 @@ SR_DRIVER([Hantek DSO], [hantek-dso], [libusb]) SR_DRIVER([Ikalogic Scanalogic-2], [ikalogic-scanalogic2], [libusb]) SR_DRIVER([Ikalogic Scanaplus], [ikalogic-scanaplus], [libftdi]) SR_DRIVER([Kecheng KC-330B], [kecheng-kc-330b], [libusb]) +SR_DRIVER([KERN scale], [kern-scale], [libserialport]) SR_DRIVER([Lascar EL-USB], [lascar-el-usb], [libusb]) SR_DRIVER([Manson HCS-3xxx], [manson-hcs-3xxx], [libserialport]) SR_DRIVER([maynuo-m97], [maynuo-m97]) @@ -395,7 +396,7 @@ AC_SUBST([SR_PKGLIBS]) # Retrieve the compile and link flags for all modules combined. # Also, bail out at this point if any module dependency is not met. PKG_CHECK_MODULES([LIBSIGROK], [glib-2.0 >= 2.32.0 $SR_PKGLIBS]) -PKG_CHECK_MODULES([CHECK], [$SR_PKGLIBS_CHECK glib-2.0 $SR_PKGLIBS]) +PKG_CHECK_MODULES([TESTS], [$SR_PKGLIBS_TESTS glib-2.0 $SR_PKGLIBS]) # SR_PKGLIBS_CXX may be empty, so only invoke these checks when # the C++ bindings are enabled.