BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix building without librevisa.

This commit is contained in:
Martin Ling 2014-02-02 16:21:33 -08:00 committed by Uwe Hermann
parent fb9e91aed4
commit b84b7ee73d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -317,9 +317,10 @@ fi
AM_CONDITIONAL(NEED_SERIAL, test "x$have_libserialport" != xno) AM_CONDITIONAL(NEED_SERIAL, test "x$have_libserialport" != xno)
PKG_CHECK_MODULES([librevisa], [librevisa >= 0.0.20130812], PKG_CHECK_MODULES([librevisa], [librevisa >= 0.0.20130812],
[CFLAGS="$CFLAGS $librevisa_CFLAGS"; [have_librevisa="yes"; CFLAGS="$CFLAGS $librevisa_CFLAGS";
LIBS="$LIBS $librevisa_LIBS"; 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. # VISA SCPI backend is only compiled in if librevisa was found.
AM_CONDITIONAL(NEED_VISA, test "x$have_librevisa" != xno) 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.]) [Specifies whether we have librevisa.])
fi fi
AM_CONDITIONAL(NEED_VISA, test "x$have_librevisa" != xno)
# libusb-1.0 is only needed for some hardware drivers. Disable the respective # libusb-1.0 is only needed for some hardware drivers. Disable the respective
# drivers if it is not found. # drivers if it is not found.
case "$host" in case "$host" in