We now require libusb >= 1.0.9.

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 54f8f15db782865c7b08bd5034212e5c6c6885be..941268cce630012949394c20a8865ba03d9325af 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,7 @@
 ## This file is part of the sigrok project.
 ##
 ## Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+## Copyright (C) 2012 Alexandru Gagniuc <mr.nuke.me@gmail.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
@@ -74,13 +75,12 @@ AC_SUBST(SR_LIB_VERSION_AGE)
 AC_SUBST(SR_LIB_VERSION)
 AC_SUBST(SR_LIB_LDFLAGS)
 
-# Logic analyzer hardware support '--enable' options.
+# Hardware support '--enable' options.
 
-# Disabled by default
 AC_ARG_ENABLE(agilent-dmm, AC_HELP_STRING([--enable-agilent-dmm],
-             [enable Agilent DMM driver support [default=no]]),
+             [enable Agilent DMM driver support [default=yes]]),
              [HW_AGILENT_DMM="$enableval"],
-             [HW_AGILENT_DMM=xno])
+             [HW_AGILENT_DMM=yes])
 AM_CONDITIONAL(HW_AGILENT_DMM, test x$HW_AGILENT_DMM = xyes)
 if test "x$HW_AGILENT_DMM" = "xyes"; then
        AC_DEFINE(HAVE_HW_AGILENT_DMM, 1, [Agilent DMM driver support])
@@ -114,6 +114,24 @@ if test "x$LA_CHRONOVU_LA8" = "xyes"; then
        AC_DEFINE(HAVE_LA_CHRONOVU_LA8, 1, [ChronoVu LA8 support])
 fi
 
+AC_ARG_ENABLE(fluke-dmm, AC_HELP_STRING([--enable-fluke-dmm],
+             [Enable Fluke DMM support. [default=yes]]),
+             [HW_FLUKE_DMM="$enableval"],
+             [HW_FLUKE_DMM=yes])
+AM_CONDITIONAL(HW_FLUKE_DMM, test x$HW_FLUKE_DMM = xyes)
+if test "x$HW_FLUKE_DMM" = "xyes"; then
+       AC_DEFINE(HAVE_HW_FLUKE_DMM, 1, [Fluke DMM support])
+fi
+
+AC_ARG_ENABLE(radioshack-dmm, AC_HELP_STRING([--enable-radioshack-dmm],
+             [Enable Radio Shack DMM support. [default=yes]]),
+             [HW_RADIOSHACK_DMM="$enableval"],
+             [HW_RADIOSHACK_DMM=yes])
+AM_CONDITIONAL(HW_RADIOSHACK_DMM, test x$HW_RADIOSHACK_DMM = xyes)
+if test "x$HW_RADIOSHACK_DMM" = "xyes"; then
+       AC_DEFINE(HAVE_HW_RADIOSHACK_DMM, 1, [Radioshack DMM support])
+       fi
+
 AC_ARG_ENABLE(fx2lafw, AC_HELP_STRING([--enable-fx2lafw],
              [enable fx2lafw support (for FX2 LAs). [default=yes]]),
              [LA_FX2LAFW="$enableval"],
@@ -123,11 +141,10 @@ if test "x$LA_FX2LAFW" = "xyes"; then
        AC_DEFINE(HAVE_LA_FX2LAFW, 1, [fx2lafw support])
 fi
 
-# Disabled by default for now
 AC_ARG_ENABLE(genericdmm, AC_HELP_STRING([--enable-genericdmm],
-             [enable genericdmm support (for most DMMs). [default=no]]),
+             [enable genericdmm support (for most DMMs). [default=yes]]),
              [HW_GENERICDMM="$enableval"],
-             [HW_GENERICDMM=no])
+             [HW_GENERICDMM=yes])
 AM_CONDITIONAL(HW_GENERICDMM, test x$HW_GENERICDMM = xyes)
 if test "x$HW_GENERICDMM" = "xyes"; then
        AC_DEFINE(HAVE_HW_GENERICDMM, 1, [Generic DMM support])
@@ -211,7 +228,7 @@ if test "x$LA_ASIX_SIGMA" != xno \
                        [Specifies whether we have a libusb.h header.])
                ;;
        *)
-               PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.5],
+               PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.9],
                        [CFLAGS="$CFLAGS $libusb_CFLAGS";
                        LIBS="$LIBS $libusb_LIBS";
                        SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"])
@@ -305,6 +322,8 @@ AC_CONFIG_FILES([Makefile
                 hardware/chronovu-la8/Makefile
                 hardware/common/Makefile
                 hardware/demo/Makefile
+                hardware/fluke-dmm/Makefile
+                hardware/radioshack-dmm/Makefile
                 hardware/fx2lafw/Makefile
                 hardware/genericdmm/Makefile
                 hardware/link-mso19/Makefile
@@ -348,6 +367,8 @@ echo "  - Agilent DMM..................... $HW_AGILENT_DMM"
 echo "  - ASIX SIGMA/SIGMA2............... $LA_ASIX_SIGMA"
 echo "  - ChronoVu LA8.................... $LA_CHRONOVU_LA8"
 echo "  - Demo driver..................... $LA_DEMO"
+echo "  - Fluke DMM....................... $HW_FLUKE_DMM"
+echo "  - Radioshack DMM.................. $HW_RADIOSHACK_DMM"
 echo "  - fx2lafw (for FX2 LAs)........... $LA_FX2LAFW"
 echo "  - Generic DMM..................... $HW_GENERICDMM"
 echo "  - Link MSO-19..................... $LA_LINK_MSO19"