sr: Fix/document probe names.

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index be5137b54d77e9addb8cab97b77615a984b3c8cb..9a6cd53808df0e161ee2bc0f18912509042e5cda 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
@@ -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
@@ -97,6 +99,16 @@ if test "x$LA_CHRONOVU_LA8" = "xyes"; then
        AC_DEFINE(HAVE_LA_CHRONOVU_LA8, 1, [ChronoVu LA8 support])
 fi
 
+# Disabled by default, unfinished.
+AC_ARG_ENABLE(fx2lafw, AC_HELP_STRING([--enable-fx2lafw],
+             [enable open source fx2lafw driver support for fx2 devices. [default=no]]),
+             [LA_FX2LAFW="$enableval"],
+             [LA_FX2LAFW=no])
+AM_CONDITIONAL(LA_FX2LAFW, test x$LA_FX2LAFW = xyes)
+if test "x$LA_FX2LAFW" = "xyes"; then
+       AC_DEFINE(HAVE_LA_FX2LAFW, 1, [fx2lafw support])
+fi
+
 AC_ARG_ENABLE(demo, AC_HELP_STRING([--enable-demo],
              [enable demo driver support [default=yes]]),
              [LA_DEMO="$enableval"],
@@ -165,7 +177,8 @@ PKG_CHECK_MODULES([gthread], [gthread-2.0 >= 2.22.0],
 if test "x$LA_SALEAE_LOGIC" != xno \
    -o "x$LA_ASIX_SIGMA" != xno \
    -o "x$LA_CHRONOVU_LA8" != xno \
-   -o "x$LA_ZEROPLUS_LOGIC_CUBE" != xno; then
+   -o "x$LA_ZEROPLUS_LOGIC_CUBE" != xno \
+   -o "x$LA_FX2LAFW" != xno; then
        case "$build" in
        *freebsd*)
                # FreeBSD comes with an "integrated" libusb-1.0-style USB API.
@@ -189,9 +202,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 +284,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
@@ -270,6 +291,7 @@ AC_CONFIG_FILES([Makefile
                 hardware/chronovu-la8/Makefile
                 hardware/common/Makefile
                 hardware/demo/Makefile
+                hardware/fx2lafw/Makefile
                 hardware/link-mso19/Makefile
                 hardware/openbench-logic-sniffer/Makefile
                 hardware/saleae-logic/Makefile
@@ -310,6 +332,7 @@ echo
 echo "  - ASIX SIGMA...................... $LA_ASIX_SIGMA"
 echo "  - ChronoVu LA8.................... $LA_CHRONOVU_LA8"
 echo "  - Demo driver..................... $LA_DEMO"
+echo "  - fx2lafw......................... $LA_FX2LAFW"
 echo "  - Link MSO-19..................... $LA_LINK_MSO19"
 echo "  - Openbench Logic Sniffer......... $LA_OLS"
 echo "  - Saleae Logic.................... $LA_SALEAE_LOGIC"