sr: adjust copyright year

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index afa88f60d26f01f254476454fe62ad6d47103730..cd2ebe865d92c6a61288688fdc461b70b047d6f1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 ##
 ## This file is part of the sigrok project.
 ##
-## Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+## Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -191,9 +191,18 @@ PKG_CHECK_MODULES([libzip], [libzip >= 0.8],
 
 # zlib is only needed for some hardware drivers.
 if test "x$LA_ASIX_SIGMA" != xno; then
-       PKG_CHECK_MODULES([zlib], [zlib >= 1.2.3.1],
-               [CFLAGS="$CFLAGS $zlib_CFLAGS"; LIBS="$LIBS $zlib_LIBS";
-               LIBSIGROK_PKGLIBS="$LIBSIGROK_PKGLIBS zlib"])
+       case "$build" in
+       *freebsd*)
+               # FreeBSD has zlib, but no pkg-config file for it.
+               # Check manually, and do NOT add it to LIBSIGROK_PKGLIBS.
+               AC_CHECK_LIB(z, uncompress)
+               ;;
+       *)
+               PKG_CHECK_MODULES([zlib], [zlib >= 1.2.3.1],
+                       [CFLAGS="$CFLAGS $zlib_CFLAGS"; LIBS="$LIBS $zlib_LIBS";
+                       LIBSIGROK_PKGLIBS="$LIBSIGROK_PKGLIBS zlib"])
+               ;;
+       esac
 fi
 
 # libftdi is only needed for some hardware drivers.
@@ -264,7 +273,6 @@ AC_DEFINE(LIBSIGROK_VERSION, [libsigrok_version],
          [Define to the libsigrok package version])
 
 AC_CONFIG_FILES([Makefile
-                sigrok.h
                 firmware/Makefile
                 hardware/Makefile
                 hardware/alsa/Makefile