X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=3cf4f9b797ff4e6d4b44d71c0e3a0de39ae5a932;hb=4cea0ff7febe335aa4607e544561710963d5e5af;hp=8efc86273ff29abbdc9d70f9658923e8602e6a56;hpb=21a7f2692e09269edd872bca4e25a9d06b67c0e5;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index 8efc8627..3cf4f9b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,7 @@ PKG_PROG_PKG_CONFIG([0.22])
 # Carefully read the libtool docs before updating these numbers!
 # The algorithm for determining which number to change (and how) is nontrivial!
 # http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
-SR_LIB_VERSION_CURRENT=1
+SR_LIB_VERSION_CURRENT=2
 SR_LIB_VERSION_REVISION=0
 SR_LIB_VERSION_AGE=0
 SR_LIB_VERSION="$SR_LIB_VERSION_CURRENT:$SR_LIB_VERSION_REVISION:$SR_LIB_VERSION_AGE"
@@ -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],
@@ -160,6 +159,15 @@ if test "x$HW_HANTEK_DSO" = "xyes"; then
 fi
 
 # Disabled by default, unfinished.
+AC_ARG_ENABLE(lascar-el-usb, AC_HELP_STRING([--enable-lascar-el-usb],
+	[enable Lascar EL-USB support [default=yes]]),
+	[HW_LASCAR_EL_USB="$enableval"],
+	[HW_LASCAR_EL_USB=yes])
+AM_CONDITIONAL(HW_LASCAR_EL_USB, test x$HW_LASCAR_EL_USB = xyes)
+if test "x$HW_LASCAR_EL_USB" = "xyes"; then
+	AC_DEFINE(HAVE_HW_LASCAR_EL_USB, 1, [Lascar EL-USB support])
+fi
+
 AC_ARG_ENABLE(link-mso19, AC_HELP_STRING([--enable-link-mso19],
 	      [enable Link Instruments MSO-19 support [default=no]]),
 	      [LA_LINK_MSO19="$enableval"],
@@ -178,15 +186,6 @@ 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(serial-dmm, AC_HELP_STRING([--enable-serial-dmm],
 	      [enable serial DMM support [default=yes]]),
 	      [HW_SERIAL_DMM="$enableval"],
@@ -242,7 +241,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.32.0],
+AM_PATH_GLIB_2_0([2.28.0],
 	[CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 
 # libgthread-2.0 is always needed (e.g. for the demo hardware driver).
@@ -250,7 +249,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 +266,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 +297,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"])
@@ -313,7 +316,6 @@ AM_CONDITIONAL(NEED_SERIAL, \
 	-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_SERIAL_DMM" != xno \
 	-o "x$HW_TONDAJ_SL_814" != xno \
 )
@@ -360,6 +362,7 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
 		 hardware/chronovu-la8/Makefile
 		 hardware/colead-slm/Makefile
 		 hardware/common/Makefile
+		 hardware/lascar-el-usb/Makefile
 		 hardware/tondaj-sl-814/Makefile
 		 hardware/victor-dmm/Makefile
 		 hardware/common/dmm/Makefile
@@ -369,7 +372,6 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
 		 hardware/hantek-dso/Makefile
 		 hardware/link-mso19/Makefile
 		 hardware/openbench-logic-sniffer/Makefile
-		 hardware/radioshack-dmm/Makefile
 		 hardware/serial-dmm/Makefile
 		 hardware/uni-t-dmm/Makefile
 		 hardware/zeroplus-logic-cube/Makefile
@@ -405,6 +407,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"
@@ -412,13 +415,13 @@ echo "  - Demo driver..................... $LA_DEMO"
 echo "  - Fluke DMM....................... $HW_FLUKE_DMM"
 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 "  - Openbench Logic Sniffer......... $LA_OLS"
-echo "  - Radioshack DMM.................. $HW_RADIOSHACK_DMM"
 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