From: Håvard Espeland <redacted>
Date: Sun, 22 Apr 2012 12:31:40 +0000 (+0200)
Subject: sr: Remove zlib dependency.
X-Git-Tag: libsigrok-0.1.1~35
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=e210c6c09003cbd4cfada74c42466ad407c73ad8;p=libsigrok.git

sr: Remove zlib dependency.

No longer needed by Sigma driver.
---

diff --git a/README b/README
index cb29ccaf..b5641468 100644
--- a/README
+++ b/README
@@ -24,7 +24,6 @@ Requirements
  - libglib >= 2.22.0
  - libusb >= 1.0.5 (for most logic analyzer hardware)
  - libzip >= 0.8
- - zlib >= 1.2.3.1
  - libftdi >= 0.16 (for some logic analyzer hardware)
  - libudev >= 151 (for some logic analyzer hardware)
 
diff --git a/configure.ac b/configure.ac
index 8c9fad59..4f2ef2b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,22 +194,6 @@ PKG_CHECK_MODULES([libzip], [libzip >= 0.8],
 	[CFLAGS="$CFLAGS $libzip_CFLAGS"; LIBS="$LIBS $libzip_LIBS";
 	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.
 if test "x$LA_ASIX_SIGMA" != xno \
      -o "x$LA_CHRONOVU_LA8" != xno; then
@@ -301,7 +285,7 @@ echo "Detected libraries:"
 echo
 
 # 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
 		ver=`$PKG_CONFIG --modversion $lib`
 		answer="yes ($ver)"
diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index 0e32908f..5fc45c34 100644
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -27,7 +27,6 @@
 #include <glib/gstdio.h>
 #include <ftdi.h>
 #include <string.h>
-#include <zlib.h>
 #include "sigrok.h"
 #include "sigrok-internal.h"
 #include "asix-sigma.h"