X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=98ce84b82dd56fa84bea548ef7e19c81e89fd800;hb=c90beca7801b16e46ffd4d74c9dd21b02a045ab5;hp=0ac2ec2348525d94d08093d8b9a80261f4b538a3;hpb=1fb2312f99a27d552cbd13df7827eb366bcc3122;p=libsigrok.git diff --git a/configure.ac b/configure.ac index 0ac2ec23..98ce84b8 100644 --- a/configure.ac +++ b/configure.ac @@ -317,9 +317,10 @@ fi AM_CONDITIONAL(NEED_SERIAL, test "x$have_libserialport" != xno) PKG_CHECK_MODULES([librevisa], [librevisa >= 0.0.20130812], - [CFLAGS="$CFLAGS $librevisa_CFLAGS"; + [have_librevisa="yes"; CFLAGS="$CFLAGS $librevisa_CFLAGS"; LIBS="$LIBS $librevisa_LIBS"; - SR_PKGLIBS="$SR_PKGLIBS librevisa"], []) + SR_PKGLIBS="$SR_PKGLIBS librevisa"], + [have_librevisa="no"]) # VISA SCPI backend is only compiled in if librevisa was found. AM_CONDITIONAL(NEED_VISA, test "x$have_librevisa" != xno) @@ -330,8 +331,6 @@ if test "x$have_librevisa" != "xno"; then [Specifies whether we have librevisa.]) fi -AM_CONDITIONAL(NEED_VISA, test "x$have_librevisa" != xno) - # libusb-1.0 is only needed for some hardware drivers. Disable the respective # drivers if it is not found. case "$host" in