X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=8eafb2213f571fbeab3a1f03d72f0aba5b40ca63;hb=a1645fcd81ed4be71d29380218acb078789a6268;hp=afa88f60d26f01f254476454fe62ad6d47103730;hpb=1a081ca67d63a0bd933a3d715792d85afd437296;p=libsigrok.git diff --git a/configure.ac b/configure.ac index afa88f60..8eafb221 100644 --- a/configure.ac +++ b/configure.ac @@ -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