Drop link-mso19/nexus-osciprime in preparation for release.

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6a20c9ec7f7154ec25eb5aa776a79175d7cc8305..aa93d7aad6a1afb8563be769dda37c2b2d3ab2d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 ##
-## This file is part of the sigrok project.
+## This file is part of the libsigrok project.
 ##
 ## Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
 ## Copyright (C) 2012 Alexandru Gagniuc <mr.nuke.me@gmail.com>
@@ -139,21 +139,11 @@ AC_ARG_ENABLE(lascar-el-usb, AC_HELP_STRING([--enable-lascar-el-usb],
        [HW_LASCAR_EL_USB="$enableval"],
        [HW_LASCAR_EL_USB=$HW_ENABLED_DEFAULT])
 
-AC_ARG_ENABLE(link-mso19, AC_HELP_STRING([--enable-link-mso19],
-       [enable Link Instruments MSO-19 support [default=yes]]),
-       [LA_LINK_MSO19="$enableval"],
-       [LA_LINK_MSO19=$HW_ENABLED_DEFAULT])
-
 AC_ARG_ENABLE(mic-985xx, AC_HELP_STRING([--enable-mic-985xx],
        [enable MIC 985xx support [default=yes]]),
        [HW_MIC_985XX="$enableval"],
        [HW_MIC_985XX=$HW_ENABLED_DEFAULT])
 
-AC_ARG_ENABLE(nexus-osciprime, AC_HELP_STRING([--enable-nexus-osciprime],
-       [enable Nexus Osciprime support [default=yes]]),
-       [HW_NEXUS_OSCIPRIME="$enableval"],
-       [HW_NEXUS_OSCIPRIME=$HW_ENABLED_DEFAULT])
-
 AC_ARG_ENABLE(ols, AC_HELP_STRING([--enable-ols],
        [enable OpenBench Logic Sniffer (OLS) support [default=yes]]),
        [LA_OLS="$enableval"],
@@ -199,7 +189,8 @@ SR_PKGLIBS=""
 
 # libglib-2.0 is always needed. Abort if it's not found.
 # Note: glib-2.0 is part of the libsigrok API (hard pkg-config requirement).
-AM_PATH_GLIB_2_0([2.28.0],
+# We require at least 2.32.0 due to e.g. g_variant_new_fixed_array().
+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.
@@ -209,7 +200,7 @@ PKG_CHECK_MODULES([libzip], [libzip >= 0.8],
 
 # libusb-1.0 is only needed for some hardware drivers. Disable the respective
 # drivers if it is not found.
-case "$build" in
+case "$host" in
 *freebsd*)
        # FreeBSD comes with an "integrated" libusb-1.0-style USB API.
        # This means libusb-1.0 is always available, no need to check for it,
@@ -245,12 +236,6 @@ PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16],
        SR_PKGLIBS="$SR_PKGLIBS libftdi"],
        [LA_ASIX_SIGMA="no"; LA_CHRONOVU_LA8="no"])
 
-# libudev is only needed for some hardware drivers. Disable them if not found.
-PKG_CHECK_MODULES([libudev], [libudev >= 151],
-       [CFLAGS="$CFLAGS $libudev_CFLAGS"; LIBS="$LIBS $libudev_LIBS";
-       SR_PKGLIBS="$SR_PKGLIBS libudev"],
-       [LA_LINK_MSO19="no"])
-
 # ALSA is only needed for some hardware drivers. Disable them if not found.
 PKG_CHECK_MODULES([alsa], [alsa >= 1.0],
        [CFLAGS="$CFLAGS $alsa_CFLAGS"; LIBS="$LIBS $alsa_LIBS";
@@ -266,7 +251,7 @@ AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
 # The Rigol DS1xx2 driver currently uses the Linux kernel usbtmc module
 # (though it is planned to rewrite the driver to be portable later).
 # Thus, it will be disabled for non-Linux builds for now.
-case "$build" in
+case "$host" in
 *linux*)
        # Do nothing. Whether the driver is enabled is determined by the
        # previous --enable-all-drivers/--disable-all-drivers and/or any
@@ -337,21 +322,11 @@ if test "x$HW_LASCAR_EL_USB" = "xyes"; then
        AC_DEFINE(HAVE_HW_LASCAR_EL_USB, 1, [Lascar EL-USB support])
 fi
 
-AM_CONDITIONAL(LA_LINK_MSO19, test x$LA_LINK_MSO19 = xyes)
-if test "x$LA_LINK_MSO19" = "xyes"; then
-       AC_DEFINE(HAVE_LA_LINK_MSO19, 1, [Link Instruments MSO-19 support])
-fi
-
 AM_CONDITIONAL(HW_MIC_985XX, test x$HW_MIC_985XX = xyes)
 if test "x$HW_MIC_985XX" = "xyes"; then
        AC_DEFINE(HAVE_HW_MIC_985XX, 1, [MIC 985xx support])
 fi
 
-AM_CONDITIONAL(HW_NEXUS_OSCIPRIME, test x$HW_NEXUS_OSCIPRIME = xyes)
-if test "x$HW_NEXUS_OSCIPRIME" = "xyes"; then
-       AC_DEFINE(HAVE_HW_NEXUS_OSCIPRIME, 1, [Nexus Osciprime support])
-fi
-
 AM_CONDITIONAL(LA_OLS, test x$LA_OLS = xyes)
 if test "x$LA_OLS" = "xyes"; then
        AC_DEFINE(HAVE_LA_OLS, 1, [OpenBench Logic Sniffer (OLS) support])
@@ -430,7 +405,6 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
                 hardware/common/Makefile
                 hardware/lascar-el-usb/Makefile
                 hardware/mic-985xx/Makefile
-                hardware/nexus-osciprime/Makefile
                 hardware/rigol-ds1xx2/Makefile
                 hardware/tondaj-sl-814/Makefile
                 hardware/victor-dmm/Makefile
@@ -439,7 +413,6 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
                 hardware/fluke-dmm/Makefile
                 hardware/fx2lafw/Makefile
                 hardware/hantek-dso/Makefile
-                hardware/link-mso19/Makefile
                 hardware/openbench-logic-sniffer/Makefile
                 hardware/serial-dmm/Makefile
                 hardware/uni-t-dmm/Makefile
@@ -460,12 +433,14 @@ echo
 echo "  - Package version (major.minor.micro):    $SR_PACKAGE_VERSION"
 echo "  - Library version (current:revision:age): $SR_LIB_VERSION"
 echo "  - Prefix: $prefix"
+echo "  - Building on: $build"
+echo "  - Building for: $host"
 echo
 echo "Detected libraries:"
 echo
 
 # Note: This only works for libs with pkg-config integration.
-for lib in "glib-2.0 >= 2.28.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.8" "libusb-1.0 >= 1.0.9" "libftdi >= 0.16" "alsa >= 1.0" "check >= 0.9.4"; do
        if `$PKG_CONFIG --exists $lib`; then
                ver=`$PKG_CONFIG --modversion $lib`
                answer="yes ($ver)"
@@ -487,9 +462,7 @@ echo "  - fluke-dmm....................... $HW_FLUKE_DMM"
 echo "  - fx2lafw......................... $LA_FX2LAFW"
 echo "  - hantek-dso...................... $HW_HANTEK_DSO"
 echo "  - lascar-el-usb................... $HW_LASCAR_EL_USB"
-echo "  - link-mso19...................... $LA_LINK_MSO19"
 echo "  - mic-985xx....................... $HW_MIC_985XX"
-echo "  - nexus-osciprime................. $HW_NEXUS_OSCIPRIME"
 echo "  - openbench-logic-sniffer......... $LA_OLS"
 echo "  - rigol-ds1xx2.................... $HW_RIGOL_DS1XX2"
 echo "  - serial-dmm...................... $HW_SERIAL_DMM"