From: Martin Ling <redacted>
Date: Mon, 3 Feb 2014 00:21:33 +0000 (-0800)
Subject: Fix building without librevisa.
X-Git-Tag: libsigrok-0.3.0~162
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=b84b7ee73d67273871d03ede6e7de89f187ef929;p=libsigrok.git

Fix building without librevisa.
---

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