serial-dmm: Handle time-limited acquisition

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e8d440df96eba099e975a9bf768ee5112cc49858..40da7be8f64b6a47f1417733029228e35846272a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -86,14 +86,13 @@ if test "x$HW_AGILENT_DMM" = "xyes"; then
        AC_DEFINE(HAVE_HW_AGILENT_DMM, 1, [Agilent DMM support])
 fi
 
-# Disabled by default, unfinished.
 AC_ARG_ENABLE(alsa, AC_HELP_STRING([--enable-alsa],
-             [enable ALSA driver support [default=no]]),
-             [LA_ALSA="$enableval"],
-             [LA_ALSA=no])
-AM_CONDITIONAL(LA_ALSA, test x$LA_ALSA = xyes)
-if test "x$LA_ALSA" = "xyes"; then
-       AC_DEFINE(HAVE_LA_ALSA, 1, [ALSA driver support])
+             [enable ALSA driver support [default=yes]]),
+             [HW_ALSA="$enableval"],
+             [HW_ALSA=yes])
+AM_CONDITIONAL(HW_ALSA, test x$HW_ALSA = xyes)
+if test "x$HW_ALSA" = "xyes"; then
+       AC_DEFINE(HAVE_HW_ALSA, 1, [ALSA driver support])
 fi
 
 AC_ARG_ENABLE(asix-sigma, AC_HELP_STRING([--enable-asix-sigma],
@@ -178,6 +177,15 @@ if test "x$LA_LINK_MSO19" = "xyes"; then
        AC_DEFINE(HAVE_LA_LINK_MSO19, 1, [Link Instruments MSO-19 support])
 fi
 
+AC_ARG_ENABLE(nexus-osciprime, AC_HELP_STRING([--enable-nexus-osciprime],
+       [enable Nexus Osciprime support [default=yes]]),
+       [HW_NEXUS_OSCIPRIME="$enableval"],
+       [HW_NEXUS_OSCIPRIME=yes])
+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
+
 AC_ARG_ENABLE(ols, AC_HELP_STRING([--enable-ols],
              [enable OpenBench Logic Sniffer (OLS) support [default=yes]]),
              [LA_OLS="$enableval"],
@@ -250,7 +258,7 @@ PKG_CHECK_MODULES([gthread], [gthread-2.0 >= 2.22.0],
        [CFLAGS="$CFLAGS $gthread_CFLAGS"; LIBS="$LIBS $gthread_LIBS";
        SR_PKGLIBS="$SR_PKGLIBS gthread-2.0"])
 
-# libusb is only needed for some hardware drivers.
+# libusb-1.0 is only needed for some hardware drivers.
 if test "x$LA_ASIX_SIGMA" != xno \
    -o "x$LA_CHRONOVU_LA8" != xno \
    -o "x$LA_FX2LAFW" != xno \
@@ -267,7 +275,11 @@ if test "x$LA_ASIX_SIGMA" != xno \
                        [CFLAGS="$CFLAGS $libusb_CFLAGS";
                        LIBS="$LIBS $libusb_LIBS";
                        SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"])
-               AC_CHECK_LIB(usb-1.0, libusb_init)
+               # Define HAVE_LIBUSB_1_0 in config.h if we found libusb-1.0.
+               if test "x$libusb_CFLAGS" != "x"; then
+                       AC_DEFINE_UNQUOTED(HAVE_LIBUSB_1_0, [1],
+                               [Specifies whether we have a libusb.h header.])
+               fi
                ;;
        esac
 fi
@@ -294,7 +306,7 @@ if test "x$LA_LINK_MSO19" != xno; then
 fi
 
 # ALSA is only needed for some hardware drivers.
-if test "x$LA_ALSA" != xno; then
+if test "x$HW_ALSA" != xno; then
        PKG_CHECK_MODULES([alsa], [alsa >= 1.0],
                [CFLAGS="$CFLAGS $alsa_CFLAGS"; LIBS="$LIBS $alsa_LIBS";
                SR_PKGLIBS="$SR_PKGLIBS alsa"])
@@ -360,6 +372,7 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
                 hardware/colead-slm/Makefile
                 hardware/common/Makefile
                 hardware/lascar-el-usb/Makefile
+                hardware/nexus-osciprime/Makefile
                 hardware/tondaj-sl-814/Makefile
                 hardware/victor-dmm/Makefile
                 hardware/common/dmm/Makefile
@@ -404,6 +417,7 @@ done
 
 echo -e "\nEnabled hardware drivers:\n"
 echo "  - Agilent DMM..................... $HW_AGILENT_DMM"
+echo "  - ALSA............................ $HW_ALSA"
 echo "  - ASIX SIGMA/SIGMA2............... $LA_ASIX_SIGMA"
 echo "  - ChronoVu LA8.................... $LA_CHRONOVU_LA8"
 echo "  - Colead SLM...................... $HW_COLEAD_SLM"
@@ -413,11 +427,12 @@ echo "  - fx2lafw (for FX2 LAs)........... $LA_FX2LAFW"
 echo "  - Hantek DSO...................... $HW_HANTEK_DSO"
 echo "  - Lascar EL-USB................... $HW_LASCAR_EL_USB"
 echo "  - Link MSO-19..................... $LA_LINK_MSO19"
+echo "  - Nexus Osciprime................. $HW_NEXUS_OSCIPRIME"
 echo "  - Openbench Logic Sniffer......... $LA_OLS"
 echo "  - Serial DMM...................... $HW_SERIAL_DMM"
 echo "  - Tondaj SL-814................... $HW_TONDAJ_SL_814"
 echo "  - UNI-T DMM....................... $HW_UNI_T_DMM"
-echo "  - victor-dmm...................... $HW_VICTOR_DMM"
+echo "  - Victor DMM...................... $HW_VICTOR_DMM"
 echo "  - ZEROPLUS Logic Cube............. $LA_ZEROPLUS_LOGIC_CUBE"
 echo