X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=cd2ebe865d92c6a61288688fdc461b70b047d6f1;hb=c73d2ea421c2b425c3f0ae33bce2bfd0c448ca5f;hp=892faf540666ca1ff459f68cad601dd00e0ebba8;hpb=4abf8dd0a540db8c8f5af5e6bd78c6eb7b473d9f;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index 892faf54..cd2ebe86 100644
--- 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
@@ -17,7 +17,8 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-AC_PREREQ(2.61)
+# We require at least autoconf 2.63 (AC_INIT format changed there).
+AC_PREREQ([2.63])
 
 # libsigrok package version number (NOT the same as shared lib version!).
 m4_define([libsigrok_major_version], [0])
@@ -31,14 +32,17 @@ AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([autostuff])
 AC_CONFIG_AUX_DIR([autostuff])
 
-AM_INIT_AUTOMAKE([-Wall -Werror foreign std-options])
+# We require at least automake 1.11 (needed for 'silent rules').
+AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign std-options])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 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
@@ -187,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.
@@ -260,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