X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=8eafb2213f571fbeab3a1f03d72f0aba5b40ca63;hb=a1645fcd81ed4be71d29380218acb078789a6268;hp=be5137b54d77e9addb8cab97b77615a984b3c8cb;hpb=ef7228ba49ddaced0f1972a4788ff2fdb8dcd57d;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index be5137b5..8eafb221 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,9 @@ AH_TOP([#ifndef LIBSIGROK_CONFIG_H
 #define LIBSIGROK_CONFIG_H    /* To stop multiple inclusions. */])
 AH_BOTTOM([#endif /* LIBSIGROK_CONFIG_H */])
 
-CFLAGS="-g -Wall -Wextra"
+# Enable more compiler warnings via -Wall and -Wextra. Add -fvisibility=hidden
+# and enforce use of SR_API to explicitly mark all public API functions.
+CFLAGS="-g -Wall -Wextra -fvisibility=hidden"
 
 # Checks for programs.
 AC_PROG_CXX
@@ -189,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.
@@ -262,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