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

sr: Remove zlib dependency. 

No longer needed by Sigma driver.
This commit is contained in:
Håvard Espeland 2012-04-22 14:31:40 +02:00
parent e3fff420da
commit e210c6c090
3 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README
View File

@ -24,7 +24,6 @@ Requirements
- libglib >= 2.22.0 - libglib >= 2.22.0
- libusb >= 1.0.5 (for most logic analyzer hardware) - libusb >= 1.0.5 (for most logic analyzer hardware)
- libzip >= 0.8 - libzip >= 0.8
- zlib >= 1.2.3.1
- libftdi >= 0.16 (for some logic analyzer hardware) - libftdi >= 0.16 (for some logic analyzer hardware)
- libudev >= 151 (for some logic analyzer hardware) - libudev >= 151 (for some logic analyzer hardware)

18
configure.ac
View File

@ -194,22 +194,6 @@ PKG_CHECK_MODULES([libzip], [libzip >= 0.8],
[CFLAGS="$CFLAGS $libzip_CFLAGS"; LIBS="$LIBS $libzip_LIBS"; [CFLAGS="$CFLAGS $libzip_CFLAGS"; LIBS="$LIBS $libzip_LIBS";
SR_PKGLIBS="$SR_PKGLIBS libzip"]) SR_PKGLIBS="$SR_PKGLIBS libzip"])
# zlib is only needed for some hardware drivers.
if test "x$LA_ASIX_SIGMA" != xno; then
case "$build" in
*freebsd*)
# FreeBSD has zlib, but no pkg-config file for it.
# Check manually, and do NOT add it to SR_PKGLIBS.
AC_CHECK_LIB(z, uncompress)
;;
*)
PKG_CHECK_MODULES([zlib], [zlib >= 1.2.3.1],
[CFLAGS="$CFLAGS $zlib_CFLAGS"; LIBS="$LIBS $zlib_LIBS";
SR_PKGLIBS="$SR_PKGLIBS zlib"])
;;
esac
fi
# libftdi is only needed for some hardware drivers. # libftdi is only needed for some hardware drivers.
if test "x$LA_ASIX_SIGMA" != xno \ if test "x$LA_ASIX_SIGMA" != xno \
-o "x$LA_CHRONOVU_LA8" != xno; then -o "x$LA_CHRONOVU_LA8" != xno; then
@ -301,7 +285,7 @@ echo "Detected libraries:"
echo echo
# Note: This only works for libs with pkg-config integration. # Note: This only works for libs with pkg-config integration.
for lib in "glib-2.0" "gthread-2.0" "libusb-1.0" "libzip" "zlib" "libftdi" "libudev" "alsa"; do for lib in "glib-2.0" "gthread-2.0" "libusb-1.0" "libzip" "libftdi" "libudev" "alsa"; do
if `$PKG_CONFIG --exists $lib`; then if `$PKG_CONFIG --exists $lib`; then
ver=`$PKG_CONFIG --modversion $lib` ver=`$PKG_CONFIG --modversion $lib`
answer="yes ($ver)" answer="yes ($ver)"

1
hardware/asix-sigma/asix-sigma.c
View File

@ -27,7 +27,6 @@
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <ftdi.h> #include <ftdi.h>
#include <string.h> #include <string.h>
#include <zlib.h>
#include "sigrok.h" #include "sigrok.h"
#include "sigrok-internal.h" #include "sigrok-internal.h"
#include "asix-sigma.h" #include "asix-sigma.h"