X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=cbe91cf39de17db843a8663db2679752e2b602ee;hb=0b9b3c41c2768c5fda73b3e38b3483278bcab202;hp=341873a013b0885b9a1fe3aa988eac11e46e6538;hpb=37fa80b4be4808958340b56dc62265e2d4f14e85;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index 341873a0..cbe91cf3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,6 +94,11 @@ AC_ARG_ENABLE(alsa, AC_HELP_STRING([--enable-alsa],
 	[HW_ALSA="$enableval"],
 	[HW_ALSA=$HW_ENABLED_DEFAULT])
 
+AC_ARG_ENABLE(appa-55ii, AC_HELP_STRING([--enable-appa-55ii],
+	[enable APPA 55II support [default=yes]]),
+	[HW_APPA_55II="$enableval"],
+	[HW_APPA_55II=$HW_ENABLED_DEFAULT])
+
 AC_ARG_ENABLE(asix-sigma, AC_HELP_STRING([--enable-asix-sigma],
 	[enable ASIX SIGMA/SIGMA2 support [default=yes]]),
 	[HW_ASIX_SIGMA="$enableval"],
@@ -273,10 +278,10 @@ PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.0],
 	[have_libserialport="yes"; CFLAGS="$CFLAGS $libserialport_CFLAGS";
 	LIBS="$LIBS $libserialport_LIBS";
 	SR_PKGLIBS="$SR_PKGLIBS libserialport"],
-	[have_libserialport="no"; HW_AGILENT_DMM="no"; HW_BRYMEN_DMM="no";
-	HW_CEM_DT_885X="no"; HW_CENTER_3XX="no"; HW_COLEAD_SLM="no";
-	HW_FLUKE_DMM="no"; HW_GMC_MH_1X_2X="no"; HW_HAMEG_HMO="no";
-	HW_LINK_MSO19="no"; HW_MIC_985XX="no";
+	[have_libserialport="no"; HW_AGILENT_DMM="no"; HW_APPA_55II="no";
+	HW_BRYMEN_DMM="no"; HW_CEM_DT_885X="no"; HW_CENTER_3XX="no";
+	HW_COLEAD_SLM="no"; HW_FLUKE_DMM="no"; HW_GMC_MH_1X_2X="no";
+	HW_HAMEG_HMO="no"; HW_LINK_MSO19="no"; HW_MIC_985XX="no";
 	HW_NORMA_DMM="no"; HW_OLS="no"; HW_RIGOL_DS="no";
 	HW_SERIAL_DMM="no"; HW_TELEINFO="no"; HW_TONDAJ_SL_814="no"])
 
@@ -300,7 +305,7 @@ case "$host" in
 		[Specifies whether we have a libusb.h header.])
 	;;
 *)
-	PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.9],
+	PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.16],
 		[have_libusb1_0="yes"; CFLAGS="$CFLAGS $libusb_CFLAGS";
 		LIBS="$LIBS $libusb_LIBS";
 		SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"],
@@ -368,6 +373,11 @@ if test "x$HW_ALSA" = "xyes"; then
 	AC_DEFINE(HAVE_HW_ALSA, 1, [ALSA driver support])
 fi
 
+AM_CONDITIONAL(HW_APPA_55II, test x$HW_APPA_55II = xyes)
+if test "x$HW_APPA_55II" = "xyes"; then
+	AC_DEFINE(HAVE_HW_APPA_55II, 1, [APPA 55II support])
+fi
+
 AM_CONDITIONAL(HW_ASIX_SIGMA, test x$HW_ASIX_SIGMA = xyes)
 if test "x$HW_ASIX_SIGMA" = "xyes"; then
 	AC_DEFINE(HAVE_HW_ASIX_SIGMA, 1, [ASIX SIGMA/SIGMA2 support])
@@ -550,6 +560,7 @@ AC_SUBST(SR_PACKAGE_VERSION)
 AC_CONFIG_FILES([Makefile version.h hardware/Makefile
 		 hardware/agilent-dmm/Makefile
 		 hardware/alsa/Makefile
+		 hardware/appa-55ii/Makefile
 		 hardware/asix-sigma/Makefile
 		 hardware/brymen-dmm/Makefile
 		 hardware/cem-dt-885x/Makefile
@@ -604,7 +615,7 @@ echo "Detected libraries:"
 echo
 
 # Note: This only works for libs with pkg-config integration.
-for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.0" "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.10" "libserialport >= 0.1.0" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" "libudev >= 151" "alsa >= 1.0" "check >= 0.9.4"; do
 	if `$PKG_CONFIG --exists $lib`; then
 		ver=`$PKG_CONFIG --modversion $lib`
 		answer="yes ($ver)"
@@ -617,6 +628,7 @@ done
 echo -e "\nEnabled hardware drivers:\n"
 echo "  - agilent-dmm..................... $HW_AGILENT_DMM"
 echo "  - alsa............................ $HW_ALSA"
+echo "  - appa-55ii....................... $HW_APPA_55II"
 echo "  - asix-sigma...................... $HW_ASIX_SIGMA"
 echo "  - brymen-dmm...................... $HW_BRYMEN_DMM"
 echo "  - cem-dt-885x..................... $HW_CEM_DT_885X"