Bump libzip requirement to >= 0.10.

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8f8aa0dafa67690425ed644dee3acd77d1ae81fe..98fa39e1047c6224b3cee9c49ffd86875ede9525 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -107,12 +107,12 @@ AC_ARG_ENABLE(brymen-dmm, AC_HELP_STRING([--enable-brymen-dmm],
 AC_ARG_ENABLE(cem-dt-885x, AC_HELP_STRING([--enable-cem-dt-885x],
        [enable CEM DT-885x support [default=yes]]),
        [HW_CEM_DT_885X="$enableval"],
-       [HW_CEM_DT_885X=yes])
+       [HW_CEM_DT_885X=$HW_ENABLED_DEFAULT])
 
 AC_ARG_ENABLE(center-3xx, AC_HELP_STRING([--enable-center-3xx],
        [enable Center 3xx support [default=yes]]),
        [HW_CENTER_3XX="$enableval"],
-       [HW_CENTER_3XX=yes])
+       [HW_CENTER_3XX=$HW_ENABLED_DEFAULT])
 
 AC_ARG_ENABLE(chronovu-la8, AC_HELP_STRING([--enable-chronovu-la8],
        [enable ChronoVu LA8 support [default=yes]]),
@@ -147,17 +147,17 @@ AC_ARG_ENABLE(hantek-dso, AC_HELP_STRING([--enable-hantek-dso],
 AC_ARG_ENABLE(ikalogic-scanalogic2, AC_HELP_STRING([--enable-ikalogic-scanalogic2],
        [enable IKALOGIC Scanalogic-2 support [default=yes]]),
        [HW_IKALOGIC_SCANALOGIC2="$enableval"],
-       [HW_IKALOGIC_SCANALOGIC2=yes])
+       [HW_IKALOGIC_SCANALOGIC2=$HW_ENABLED_DEFAULT])
 
 AC_ARG_ENABLE(ikalogic-scanaplus, AC_HELP_STRING([--enable-ikalogic-scanaplus],
        [enable IKALOGIC ScanaPLUS support [default=yes]]),
        [HW_IKALOGIC_SCANAPLUS="$enableval"],
-       [HW_IKALOGIC_SCANAPLUS=yes])
+       [HW_IKALOGIC_SCANAPLUS=$HW_ENABLED_DEFAULT])
 
 AC_ARG_ENABLE(kecheng-kc-330b, AC_HELP_STRING([--enable-kecheng-kc-330b],
        [enable Kecheng KC-330B support [default=yes]]),
        [HW_KECHENG_KC_330B="$enableval"],
-       [HW_KECHENG_KC_330B=yes])
+       [HW_KECHENG_KC_330B=$HW_ENABLED_DEFAULT])
 
 AC_ARG_ENABLE(lascar-el-usb, AC_HELP_STRING([--enable-lascar-el-usb],
        [enable Lascar EL-USB support [default=yes]]),
@@ -184,6 +184,11 @@ AC_ARG_ENABLE(rigol-ds1xx2, AC_HELP_STRING([--enable-rigol-ds1xx2],
        [HW_RIGOL_DS1XX2="$enableval"],
        [HW_RIGOL_DS1XX2=$HW_ENABLED_DEFAULT])
 
+AC_ARG_ENABLE(saleae-logic16, AC_HELP_STRING([--enable-saleae-logic16],
+       [enable Saleae Logic16 support [default=yes]]),
+       [HW_SALEAE_LOGIC16="$enableval"],
+       [HW_SALEAE_LOGIC16=$HW_ENABLED_DEFAULT])
+
 AC_ARG_ENABLE(serial-dmm, AC_HELP_STRING([--enable-serial-dmm],
        [enable serial DMM support [default=yes]]),
        [HW_SERIAL_DMM="$enableval"],
@@ -202,7 +207,7 @@ AC_ARG_ENABLE(uni-t-dmm, AC_HELP_STRING([--enable-uni-t-dmm],
 AC_ARG_ENABLE(uni-t-ut32x, AC_HELP_STRING([--enable-uni-t-ut32x],
        [enable UNI-T UT32x support [default=yes]]),
        [HW_UNI_T_UT32X="$enableval"],
-       [HW_UNI_T_UT32X=yes])
+       [HW_UNI_T_UT32X=$HW_ENABLED_DEFAULT])
 
 AC_ARG_ENABLE(victor-dmm, AC_HELP_STRING([--enable-victor-dmm],
        [enable victor-dmm support [default=yes]]),
@@ -232,7 +237,7 @@ AM_PATH_GLIB_2_0([2.32.0],
        [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 
 # libzip is always needed. Abort if it's not found.
-PKG_CHECK_MODULES([libzip], [libzip >= 0.8],
+PKG_CHECK_MODULES([libzip], [libzip >= 0.10],
        [CFLAGS="$CFLAGS $libzip_CFLAGS"; LIBS="$LIBS $libzip_LIBS";
        SR_PKGLIBS="$SR_PKGLIBS libzip"])
 
@@ -254,8 +259,8 @@ case "$host" in
                [have_libusb1_0="no"; HW_FX2LAFW="no"; HW_HANTEK_DSO="no";
                HW_IKALOGIC_SCANALOGIC2="no"; HW_KECHENG_KC_330B="no";
                HW_LASCAR_EL_USB="no";
-               HW_UNI_T_DMM="no"; HW_VICTOR_DMM="no";
-               HW_ZEROPLUS_LOGIC_CUBE="no"])
+               HW_UNI_T_DMM="no"; HW_UNI_T_UT32X="no"; HW_VICTOR_DMM="no";
+               HW_ZEROPLUS_LOGIC_CUBE="no"; HW_SALEAE_LOGIC16="no"])
 
        # Define HAVE_LIBUSB_1_0 in config.h if we found libusb-1.0.
        if test "x$have_libusb1_0" != "xno"; then
@@ -442,11 +447,17 @@ if test "x$HW_ZEROPLUS_LOGIC_CUBE" = "xyes"; then
        AC_DEFINE(HAVE_HW_ZEROPLUS_LOGIC_CUBE, 1, [ZEROPLUS Logic Cube support])
 fi
 
+AM_CONDITIONAL(HW_SALEAE_LOGIC16, test x$HW_SALEAE_LOGIC16 = xyes)
+if test "x$HW_SALEAE_LOGIC16" = "xyes"; then
+       AC_DEFINE(HAVE_HW_SALEAE_LOGIC16, 1, [Saleae Logic16 support])
+fi
+
 # Checks for header files.
 # These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h.
 AC_CHECK_HEADERS([fcntl.h sys/time.h termios.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
+AC_C_BIGENDIAN
 AC_C_INLINE
 AC_TYPE_INT8_T
 AC_TYPE_INT16_T
@@ -491,6 +502,7 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
                 hardware/lascar-el-usb/Makefile
                 hardware/mic-985xx/Makefile
                 hardware/rigol-ds1xx2/Makefile
+                hardware/saleae-logic16/Makefile
                 hardware/tondaj-sl-814/Makefile
                 hardware/victor-dmm/Makefile
                 hardware/common/dmm/Makefile
@@ -527,7 +539,7 @@ echo "Detected libraries:"
 echo
 
 # Note: This only works for libs with pkg-config integration.
-for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.8" "libusb-1.0 >= 1.0.9" "libftdi >= 0.16" "libudev >= 151" "alsa >= 1.0" "check >= 0.9.4"; do
+for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libusb-1.0 >= 1.0.9" "libftdi >= 0.16" "libudev >= 151" "alsa >= 1.0" "check >= 0.9.4"; do
        if `$PKG_CONFIG --exists $lib`; then
                ver=`$PKG_CONFIG --modversion $lib`
                answer="yes ($ver)"
@@ -558,6 +570,7 @@ echo "  - link-mso19 (EXPERIMENTAL)....... $HW_LINK_MSO19"
 echo "  - mic-985xx....................... $HW_MIC_985XX"
 echo "  - openbench-logic-sniffer......... $HW_OLS"
 echo "  - rigol-ds1xx2.................... $HW_RIGOL_DS1XX2"
+echo "  - saleae-logic16.................. $HW_SALEAE_LOGIC16"
 echo "  - serial-dmm...................... $HW_SERIAL_DMM"
 echo "  - tondaj-sl-814................... $HW_TONDAJ_SL_814"
 echo "  - uni-t-dmm....................... $HW_UNI_T_DMM"