X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=8d87c98fb702b639ed2bcd74d1b890626a66d4cb;hb=8c012adbc15fcb00aee23f472b08b108d46b818b;hp=d34a701982df5bd402e663ac935b891b6a8f8148;hpb=ca3d84cca1d2f7427f8c5266717cb787d2346e16;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index d34a7019..8d87c98f 100644
--- 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,7 +75,16 @@ 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.
+
+AC_ARG_ENABLE(agilent-dmm, AC_HELP_STRING([--enable-agilent-dmm],
+	      [enable Agilent DMM support [default=yes]]),
+	      [HW_AGILENT_DMM="$enableval"],
+	      [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 support])
+fi
 
 # Disabled by default, unfinished.
 AC_ARG_ENABLE(alsa, AC_HELP_STRING([--enable-alsa],
@@ -104,23 +114,13 @@ if test "x$LA_CHRONOVU_LA8" = "xyes"; then
 	AC_DEFINE(HAVE_LA_CHRONOVU_LA8, 1, [ChronoVu LA8 support])
 fi
 
-AC_ARG_ENABLE(fx2lafw, AC_HELP_STRING([--enable-fx2lafw],
-	      [enable fx2lafw support (for FX2 LAs). [default=yes]]),
-	      [LA_FX2LAFW="$enableval"],
-	      [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])
-fi
-
-# Disabled by default for now
-AC_ARG_ENABLE(genericdmm, AC_HELP_STRING([--enable-genericdmm],
-	      [enable genericdmm support (for most DMMs). [default=no]]),
-	      [HW_GENERICDMM="$enableval"],
-	      [HW_GENERICDMM=no])
-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])
+AC_ARG_ENABLE(colead-slm, AC_HELP_STRING([--enable-colead-slm],
+	[enable Colead SLM support [default=yes]]),
+	[HW_COLEAD_SLM="$enableval"],
+	[HW_COLEAD_SLM=yes])
+AM_CONDITIONAL(HW_COLEAD_SLM, test x$HW_COLEAD_SLM = xyes)
+if test "x$HW_COLEAD_SLM" = "xyes"; then
+	AC_DEFINE(HAVE_HW_COLEAD_SLM, 1, [Colead SLM support])
 fi
 
 AC_ARG_ENABLE(demo, AC_HELP_STRING([--enable-demo],
@@ -132,6 +132,33 @@ if test "x$LA_DEMO" = "xyes"; then
 	AC_DEFINE(HAVE_LA_DEMO, 1, [Demo driver 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(fx2lafw, AC_HELP_STRING([--enable-fx2lafw],
+	      [enable fx2lafw support (for FX2 LAs). [default=yes]]),
+	      [LA_FX2LAFW="$enableval"],
+	      [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])
+fi
+
+AC_ARG_ENABLE(hantek-dso, AC_HELP_STRING([--enable-hantek-dso],
+	      [enable Hantek DSO support [default=yes]]),
+	      [HW_HANTEK_DSO="$enableval"],
+	      [HW_HANTEK_DSO=yes])
+AM_CONDITIONAL(HW_HANTEK_DSO, test x$HW_HANTEK_DSO = xyes)
+if test "x$HW_HANTEK_DSO" = "xyes"; then
+	AC_DEFINE(HAVE_HW_HANTEK_DSO, 1, [Hantek DSO support])
+fi
+
 # Disabled by default, unfinished.
 AC_ARG_ENABLE(link-mso19, AC_HELP_STRING([--enable-link-mso19],
 	      [enable Link Instruments MSO-19 support [default=no]]),
@@ -151,6 +178,51 @@ if test "x$LA_OLS" = "xyes"; then
 	AC_DEFINE(HAVE_LA_OLS, 1, [OpenBench Logic Sniffer (OLS) support])
 fi
 
+AC_ARG_ENABLE(radioshack-dmm, AC_HELP_STRING([--enable-radioshack-dmm],
+	      [enable RadioShack 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(tekpower-dmm, AC_HELP_STRING([--enable-tekpower-dmm],
+	      [enable TekPower DMM support [default=yes]]),
+	      [HW_TEKPOWER_DMM="$enableval"],
+	      [HW_TEKPOWER_DMM=yes])
+AM_CONDITIONAL(HW_TEKPOWER_DMM, test x$HW_TEKPOWER_DMM = xyes)
+if test "x$HW_TEKPOWER_DMM" = "xyes"; then
+	AC_DEFINE(HAVE_HW_TEKPOWER_DMM, 1, [TekPower DMM support])
+fi
+
+AC_ARG_ENABLE(tondaj-sl-814, AC_HELP_STRING([--enable-tondaj-sl-814],
+	[enable Tondaj SL-814 support [default=yes]]),
+	[HW_TONDAJ_SL_814="$enableval"],
+	[HW_TONDAJ_SL_814=yes])
+AM_CONDITIONAL(HW_TONDAJ_SL_814, test x$HW_TONDAJ_SL_814 = xyes)
+if test "x$HW_TONDAJ_SL_814" = "xyes"; then
+	AC_DEFINE(HAVE_HW_TONDAJ_SL_814, 1, [Tondaj SL-814 support])
+fi
+
+AC_ARG_ENABLE(uni-t-dmm, AC_HELP_STRING([--enable-uni-t-dmm],
+	      [enable UNI-T DMM support [default=yes]]),
+	      [HW_UNI_T_DMM="$enableval"],
+	      [HW_UNI_T_DMM=yes])
+AM_CONDITIONAL(HW_UNI_T_DMM, test x$HW_UNI_T_DMM = xyes)
+if test "x$HW_UNI_T_DMM" = "xyes"; then
+	AC_DEFINE(HAVE_HW_UNI_T_DMM, 1, [UNI-T DMM support])
+fi
+
+AC_ARG_ENABLE(victor-dmm, AC_HELP_STRING([--enable-victor-dmm],
+	[enable victor-dmm support [default=yes]]),
+	[HW_VICTOR_DMM="$enableval"],
+	[HW_VICTOR_DMM=yes])
+AM_CONDITIONAL(HW_VICTOR_DMM, test x$HW_VICTOR_DMM = xyes)
+if test "x$HW_VICTOR_DMM" = "xyes"; then
+	AC_DEFINE(HAVE_HW_VICTOR_DMM, 1, [victor-dmm support])
+fi
+
 AC_ARG_ENABLE(zeroplus-logic-cube,
 	      AC_HELP_STRING([--enable-zeroplus-logic-cube],
 	      [enable ZEROPLUS Logic Cube support [default=yes]]),
@@ -161,26 +233,6 @@ if test "x$LA_ZEROPLUS_LOGIC_CUBE" = "xyes"; then
 	AC_DEFINE(HAVE_LA_ZEROPLUS_LOGIC_CUBE, 1, [ZEROPLUS Logic Cube support])
 fi
 
-AC_ARG_ENABLE(hantek-dso,
-	      AC_HELP_STRING([--enable-hantek-dso],
-	      [enable Hantek DSO support [default=yes]]),
-	      [HW_HANTEK_DSO="$enableval"],
-	      [HW_HANTEK_DSO=yes])
-AM_CONDITIONAL(HW_HANTEK_DSO, test x$HW_HANTEK_DSO = xyes)
-if test "x$HW_HANTEK_DSO" = "xyes"; then
-	AC_DEFINE(HAVE_HW_HANTEK_DSO, 1, [Hantek DSO support])
-fi
-
-AC_ARG_ENABLE(mastech-va18b,
-	      AC_HELP_STRING([--enable-mastech-va18b],
-	      [enable Mastech VA18B support [default=no]]),
-	      [HW_MASTECH_VA18B="$enableval"],
-	      [HW_MASTECH_VA18B=no])
-AM_CONDITIONAL(HW_MASTECH_VA18B, test x$HW_MASTECH_VA18B = xyes)
-if test "x$HW_MASTECH_VA18B" = "xyes"; then
-	AC_DEFINE(HAVE_HW_MASTECH_VA18B, 1, [Mastech VA18B support])
-fi
-
 # Checks for libraries.
 
 # This variable collects the pkg-config names of all detected libs.
@@ -190,7 +242,7 @@ SR_PKGLIBS=""
 
 # libglib-2.0 is always needed.
 # Note: glib-2.0 is part of the libsigrok API (hard pkg-config requirement).
-AM_PATH_GLIB_2_0([2.28.0],
+AM_PATH_GLIB_2_0([2.32.0],
 	[CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 
 # libgthread-2.0 is always needed (e.g. for the demo hardware driver).
@@ -201,8 +253,9 @@ PKG_CHECK_MODULES([gthread], [gthread-2.0 >= 2.22.0],
 # libusb is only needed for some hardware drivers.
 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
+   -o "x$LA_FX2LAFW" != xno \
+   -o "x$HW_HANTEK_DSO" != xno \
+   -o "x$LA_ZEROPLUS_LOGIC_CUBE" != xno; then
 	case "$build" in
 	*freebsd*)
 		# FreeBSD comes with an "integrated" libusb-1.0-style USB API.
@@ -210,7 +263,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"])
@@ -247,6 +300,24 @@ if test "x$LA_ALSA" != xno; then
 		SR_PKGLIBS="$SR_PKGLIBS alsa"])
 fi
 
+# EZUSB FX2 firmware helper code is only needed for some hardware drivers.
+AM_CONDITIONAL(NEED_EZUSB, \
+	test "x$LA_FX2LAFW" != xno \
+	-o "x$HW_HANTEK_DSO" != xno \
+)
+
+# Serial port helper code is only needed for some hardware drivers.
+AM_CONDITIONAL(NEED_SERIAL, \
+	test "x$HW_AGILENT_DMM" != xno \
+	-o "x$HW_COLEAD_SLM" != xno \
+	-o "x$HW_FLUKE_DMM" != xno \
+	-o "x$LA_LINK_MSO19" != xno \
+	-o "x$LA_OLS" != xno \
+	-o "x$HW_RADIOSHACK_DMM" != xno \
+	-o "x$HW_TEKPOWER_DMM" != xno \
+	-o "x$HW_TONDAJ_SL_814" != xno \
+)
+
 AC_SUBST(SR_PKGLIBS)
 
 # Checks for header files.
@@ -282,21 +353,26 @@ AC_SUBST(SR_PACKAGE_VERSION_MINOR)
 AC_SUBST(SR_PACKAGE_VERSION_MICRO)
 AC_SUBST(SR_PACKAGE_VERSION)
 
-AC_CONFIG_FILES([Makefile
-		 sigrok.h
-		 hardware/Makefile
+AC_CONFIG_FILES([Makefile version.h hardware/Makefile
+		 hardware/agilent-dmm/Makefile
 		 hardware/alsa/Makefile
 		 hardware/asix-sigma/Makefile
 		 hardware/chronovu-la8/Makefile
+		 hardware/colead-slm/Makefile
 		 hardware/common/Makefile
+		 hardware/tondaj-sl-814/Makefile
+		 hardware/victor-dmm/Makefile
+		 hardware/common/dmm/Makefile
 		 hardware/demo/Makefile
+		 hardware/fluke-dmm/Makefile
 		 hardware/fx2lafw/Makefile
-		 hardware/genericdmm/Makefile
+		 hardware/hantek-dso/Makefile
 		 hardware/link-mso19/Makefile
 		 hardware/openbench-logic-sniffer/Makefile
+		 hardware/radioshack-dmm/Makefile
+		 hardware/tekpower-dmm/Makefile
+		 hardware/uni-t-dmm/Makefile
 		 hardware/zeroplus-logic-cube/Makefile
-		 hardware/hantek-dso/Makefile
-		 hardware/mastech-va18b/Makefile
 		 input/Makefile
 		 output/Makefile
 		 output/text/Makefile
@@ -327,18 +403,22 @@ for lib in "glib-2.0" "gthread-2.0" "libusb-1.0" "libzip" "libftdi" "libudev" "a
 	echo "  - $lib: $answer"
 done
 
-echo
-echo "Enabled hardware drivers:"
-echo
+echo -e "\nEnabled hardware drivers:\n"
+echo "  - Agilent DMM..................... $HW_AGILENT_DMM"
 echo "  - ASIX SIGMA/SIGMA2............... $LA_ASIX_SIGMA"
 echo "  - ChronoVu LA8.................... $LA_CHRONOVU_LA8"
+echo "  - Colead SLM...................... $HW_COLEAD_SLM"
 echo "  - Demo driver..................... $LA_DEMO"
+echo "  - Fluke DMM....................... $HW_FLUKE_DMM"
 echo "  - fx2lafw (for FX2 LAs)........... $LA_FX2LAFW"
-echo "  - Generic DMM..................... $HW_GENERICDMM"
+echo "  - Hantek DSO...................... $HW_HANTEK_DSO"
 echo "  - Link MSO-19..................... $LA_LINK_MSO19"
 echo "  - Openbench Logic Sniffer......... $LA_OLS"
+echo "  - Radioshack DMM.................. $HW_RADIOSHACK_DMM"
+echo "  - TekPower DMM.................... $HW_TEKPOWER_DMM"
+echo "  - Tondaj SL-814................... $HW_TONDAJ_SL_814"
+echo "  - UNI-T DMM....................... $HW_UNI_T_DMM"
+echo "  - victor-dmm...................... $HW_VICTOR_DMM"
 echo "  - ZEROPLUS Logic Cube............. $LA_ZEROPLUS_LOGIC_CUBE"
-echo "  - Hantek DSO...................... $HW_HANTEK_DSO"
-echo "  - Mastech VA18B................... $HW_MASTECH_VA18B"
 echo