sigma: Bump copyright notice.

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 51486960ef8791ac81fb28af109dcb16397ca687..4f2ef2b0bbde273aa0223f402df9549b26fea906 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -107,7 +107,7 @@ fi
 AC_ARG_ENABLE(fx2lafw, AC_HELP_STRING([--enable-fx2lafw],
              [enable fx2lafw support (for FX2 LAs). [default=no]]),
              [LA_FX2LAFW="$enableval"],
-             [LA_FX2LAFW=no])
+             [LA_FX2LAFW=yes])
 AM_CONDITIONAL(LA_FX2LAFW, test x$LA_FX2LAFW = xyes)
 if test "x$LA_FX2LAFW" = "xyes"; then
        AC_DEFINE(HAVE_LA_FX2LAFW, 1, [fx2lafw support])
@@ -141,15 +141,6 @@ if test "x$LA_OLS" = "xyes"; then
        AC_DEFINE(HAVE_LA_OLS, 1, [OpenBench Logic Sniffer (OLS) support])
 fi
 
-AC_ARG_ENABLE(saleae-logic, AC_HELP_STRING([--enable-saleae-logic],
-             [enable Saleae Logic support [default=yes]]),
-             [LA_SALEAE_LOGIC="$enableval"],
-             [LA_SALEAE_LOGIC=yes])
-AM_CONDITIONAL(LA_SALEAE_LOGIC, test x$LA_SALEAE_LOGIC = xyes)
-if test "x$LA_SALEAE_LOGIC" = "xyes"; then
-       AC_DEFINE(HAVE_LA_SALEAE_LOGIC, 1, [Saleae Logic support])
-fi
-
 AC_ARG_ENABLE(zeroplus-logic-cube,
              AC_HELP_STRING([--enable-zeroplus-logic-cube],
              [enable Zeroplus Logic Cube support [default=yes]]),
@@ -178,8 +169,7 @@ PKG_CHECK_MODULES([gthread], [gthread-2.0 >= 2.22.0],
        SR_PKGLIBS="$SR_PKGLIBS gthread-2.0"])
 
 # libusb is only needed for some hardware drivers.
-if test "x$LA_SALEAE_LOGIC" != xno \
-   -o "x$LA_ASIX_SIGMA" != xno \
+if test "x$LA_ASIX_SIGMA" != xno \
    -o "x$LA_CHRONOVU_LA8" != xno \
    -o "x$LA_ZEROPLUS_LOGIC_CUBE" != xno \
    -o "x$LA_FX2LAFW" != xno; then
@@ -204,22 +194,6 @@ PKG_CHECK_MODULES([libzip], [libzip >= 0.8],
        [CFLAGS="$CFLAGS $libzip_CFLAGS"; LIBS="$LIBS $libzip_LIBS";
        SR_PKGLIBS="$SR_PKGLIBS libzip"])
 
-# zlib is only needed for some hardware drivers.
-if test "x$LA_ASIX_SIGMA" != xno; then
-       case "$build" in
-       *freebsd*)
-               # FreeBSD has zlib, but no pkg-config file for it.
-               # Check manually, and do NOT add it to SR_PKGLIBS.
-               AC_CHECK_LIB(z, uncompress)
-               ;;
-       *)
-               PKG_CHECK_MODULES([zlib], [zlib >= 1.2.3.1],
-                       [CFLAGS="$CFLAGS $zlib_CFLAGS"; LIBS="$LIBS $zlib_LIBS";
-                       SR_PKGLIBS="$SR_PKGLIBS zlib"])
-               ;;
-       esac
-fi
-
 # libftdi is only needed for some hardware drivers.
 if test "x$LA_ASIX_SIGMA" != xno \
      -o "x$LA_CHRONOVU_LA8" != xno; then
@@ -290,7 +264,6 @@ AC_CONFIG_FILES([Makefile
                 hardware/fx2lafw/Makefile
                 hardware/link-mso19/Makefile
                 hardware/openbench-logic-sniffer/Makefile
-                hardware/saleae-logic/Makefile
                 hardware/zeroplus-logic-cube/Makefile
                 input/Makefile
                 output/Makefile
@@ -312,7 +285,7 @@ echo "Detected libraries:"
 echo
 
 # Note: This only works for libs with pkg-config integration.
-for lib in "glib-2.0" "gthread-2.0" "libusb-1.0" "libzip" "zlib" "libftdi" "libudev" "alsa"; do
+for lib in "glib-2.0" "gthread-2.0" "libusb-1.0" "libzip" "libftdi" "libudev" "alsa"; do
        if `$PKG_CONFIG --exists $lib`; then
                ver=`$PKG_CONFIG --modversion $lib`
                answer="yes ($ver)"
@@ -331,7 +304,6 @@ echo "  - Demo driver..................... $LA_DEMO"
 echo "  - fx2lafw (for FX2 LAs)........... $LA_FX2LAFW"
 echo "  - Link MSO-19..................... $LA_LINK_MSO19"
 echo "  - Openbench Logic Sniffer......... $LA_OLS"
-echo "  - Saleae Logic.................... $LA_SALEAE_LOGIC"
 echo "  - Zeroplus Logic Cube............. $LA_ZEROPLUS_LOGIC_CUBE"
 echo