X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=9c329369c61fa4099d9d3a42ef8a3429dc5eccc3;hb=6dcb97230eac000a4033aef0d5ec1099e5f8143d;hp=f8db30c79ced39ef20ea6294f45282e40956ba50;hpb=7e7b7fb7d323f7600958bf29025ca089a15829e3;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index f8db30c7..9c329369 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,8 +23,8 @@ AC_PREREQ([2.63])
 
 # libsigrok package version number (NOT the same as shared lib version!).
 m4_define([sr_package_version_major], [0])
-m4_define([sr_package_version_minor], [2])
-m4_define([sr_package_version_micro], [2])
+m4_define([sr_package_version_minor], [3])
+m4_define([sr_package_version_micro], [0])
 m4_define([sr_package_version], [sr_package_version_major.sr_package_version_minor.sr_package_version_micro])
 
 AC_INIT([libsigrok], [sr_package_version], [sigrok-devel@lists.sourceforge.net],
@@ -44,7 +44,8 @@ AH_BOTTOM([#endif /* SR_CONFIG_H */])
 
 # Enable more compiler warnings via -Wall and -Wextra. Add -fvisibility=hidden
 # and enforce use of SR_API to explicitly mark all public API functions.
-CFLAGS="$CFLAGS -Wall -Wextra -Wmissing-prototypes -fvisibility=hidden"
+COMMON_FLAGS="$CFLAGS -Wall -Wextra -fvisibility=hidden"
+CFLAGS="$COMMON_FLAGS -Wmissing-prototypes"
 
 # Checks for programs.
 AC_PROG_CC
@@ -66,8 +67,8 @@ 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_REVISION=2
+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"
 SR_LIB_LDFLAGS="-version-info $SR_LIB_VERSION"
@@ -189,16 +190,21 @@ AC_ARG_ENABLE(lascar-el-usb, AC_HELP_STRING([--enable-lascar-el-usb],
 	[HW_LASCAR_EL_USB="$enableval"],
 	[HW_LASCAR_EL_USB=$HW_ENABLED_DEFAULT])
 
-AC_ARG_ENABLE(link-mso19, AC_HELP_STRING([--enable-link-mso19],
-	[enable Link Instruments MSO-19 support [default=no]]),
-	[HW_LINK_MSO19="$enableval"],
-	[HW_LINK_MSO19="no"])
+AC_ARG_ENABLE(manson-hcs-3xxx, AC_HELP_STRING([--enable-manson-hcs-3xxx],
+	[enable Manson HCS-3xxx support [default=yes]]),
+	[HW_MANSON_HCS_3XXX="$enableval"],
+	[HW_MANSON_HCS_3XXX=$HW_ENABLED_DEFAULT])
 
 AC_ARG_ENABLE(mic-985xx, AC_HELP_STRING([--enable-mic-985xx],
 	[enable MIC 985xx support [default=yes]]),
 	[HW_MIC_985XX="$enableval"],
 	[HW_MIC_985XX=$HW_ENABLED_DEFAULT])
 
+AC_ARG_ENABLE(motech-lps-30x, AC_HELP_STRING([--enable-motech-lps-30x],
+	[enable motech-lps-30x support [default=yes]]),
+	[HW_MOTECH_LPS_30X="$enableval"],
+	[HW_MOTECH_LPS_30X=$HW_ENABLED_DEFAULT])
+
 AC_ARG_ENABLE(norma-dmm, AC_HELP_STRING([--enable-norma-dmm],
 	[enable Norma DMM support [default=yes]]),
 	[HW_NORMA_DMM="$enableval"],
@@ -234,6 +240,11 @@ AC_ARG_ENABLE(teleinfo, AC_HELP_STRING([--enable-teleinfo],
 	[HW_TELEINFO="$enableval"],
 	[HW_TELEINFO=$HW_ENABLED_DEFAULT])
 
+AC_ARG_ENABLE(testo, AC_HELP_STRING([--enable-testo],
+	[enable Testo support [default=yes]]),
+	[HW_TESTO="$enableval"],
+	[HW_TESTO=$HW_ENABLED_DEFAULT])
+
 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"],
@@ -260,6 +271,18 @@ AC_ARG_ENABLE(zeroplus-logic-cube,
 	[HW_ZEROPLUS_LOGIC_CUBE="$enableval"],
 	[HW_ZEROPLUS_LOGIC_CUBE=$HW_ENABLED_DEFAULT])
 
+AC_ARG_ENABLE(libserialport,
+	AC_HELP_STRING([--disable-libserialport],
+	[disable libserialport support [default=detect]]))
+
+AC_ARG_ENABLE(libftdi,
+	AC_HELP_STRING([--disable-libftdi],
+	[disable libftdi support [default=detect]]))
+
+AC_ARG_ENABLE(libusb,
+	AC_HELP_STRING([--disable-libusb],
+	[disable libusb support [default=detect]]))
+
 # Checks for libraries.
 
 case "$host" in
@@ -292,28 +315,38 @@ AM_CONDITIONAL(NEED_RPC, test "x$have_rpc" != "x0")
 # Note: glib-2.0 is part of the libsigrok API (hard pkg-config requirement).
 # We require at least 2.32.0 due to e.g. g_variant_new_fixed_array().
 AM_PATH_GLIB_2_0([2.32.0],
-	[CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
+	[LIB_CFLAGS="$LIB_CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 
 # libzip is always needed. Abort if it's not found.
 PKG_CHECK_MODULES([libzip], [libzip >= 0.10],
-	[CFLAGS="$CFLAGS $libzip_CFLAGS"; LIBS="$LIBS $libzip_LIBS";
+	[LIB_CFLAGS="$LIB_CFLAGS $libzip_CFLAGS"; LIBS="$LIBS $libzip_LIBS";
 	SR_PKGLIBS="$SR_PKGLIBS libzip"])
 
 # libserialport is only needed for some hardware drivers. Disable the
 # respective drivers if it is not found.
-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_APPA_55II="no";
-	HW_ATTEN_PPS3XXX="no"; HW_BRYMEN_DMM="no"; HW_CEM_DT_885X="no";
-	HW_CENTER_3XX="no"; HW_COLEAD_SLM="no"; HW_CONRAD_DIGI_35_CPU="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_SERIAL_DMM="no"; HW_TELEINFO="no"; HW_TONDAJ_SL_814="no"])
+if test "x$enable_libserialport" != "xno"; then
+	PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.0],
+		[have_libserialport="yes"; LIB_CFLAGS="$LIB_CFLAGS $libserialport_CFLAGS";
+		LIBS="$LIBS $libserialport_LIBS";
+		SR_PKGLIBS="$SR_PKGLIBS libserialport"],
+		[have_libserialport="no"])
+	if test "x$enable_libserialport$have_libserialport" = "xyesno"; then
+		AC_MSG_ERROR([libserialport support requested, but it was not found])
+	fi
+else
+	have_libserialport="no"
+fi
 
 # Define HAVE_LIBSERIALPORT in config.h if we found libserialport.
-if test "x$have_libserialport" != "xno"; then
+if test "x$have_libserialport" = "xno"; then
+	HW_AGILENT_DMM="no"; HW_APPA_55II="no";
+	HW_ATTEN_PPS3XXX="no"; HW_BRYMEN_DMM="no"; HW_CEM_DT_885X="no";
+	HW_CENTER_3XX="no"; HW_COLEAD_SLM="no"; HW_CONRAD_DIGI_35_CPU="no";
+	HW_FLUKE_DMM="no"; HW_GMC_MH_1X_2X="no"; HW_HAMEG_HMO="no";
+	HW_MANSON_HCS_3XXX="no"; HW_MIC_985XX="no"; HW_MOTECH_LPS_30X="no";
+	HW_NORMA_DMM="no"; HW_OLS="no"; HW_SERIAL_DMM="no"; HW_TELEINFO="no";
+	HW_TONDAJ_SL_814="no";
+else
 	AC_DEFINE_UNQUOTED(HAVE_LIBSERIALPORT, [1],
 		[Specifies whether we have libserialport.])
 fi
@@ -322,7 +355,7 @@ fi
 AM_CONDITIONAL(NEED_SERIAL, test "x$have_libserialport" != xno)
 
 PKG_CHECK_MODULES([librevisa], [librevisa >= 0.0.20130812],
-	[have_librevisa="yes"; CFLAGS="$CFLAGS $librevisa_CFLAGS";
+	[have_librevisa="yes"; LIB_CFLAGS="$LIB_CFLAGS $librevisa_CFLAGS";
 	LIBS="$LIBS $librevisa_LIBS";
 	SR_PKGLIBS="$SR_PKGLIBS librevisa"],
 	[have_librevisa="no"])
@@ -338,66 +371,84 @@ fi
 
 # libusb-1.0 is only needed for some hardware drivers. Disable the respective
 # drivers if it is not found.
-case "$host" in
-*freebsd*)
-	# FreeBSD comes with an "integrated" libusb-1.0-style USB API.
-	# This means libusb-1.0 is always available, no need to check for it,
-	# and no need to (potentially) disable any drivers if it's not found.
+if test "x$enable_libusb" != "xno"; then
+	case "$host" in
+	*freebsd*)
+		# FreeBSD comes with an "integrated" libusb-1.0-style USB API.
+		# This means libusb-1.0 is always available, no need to check for it,
+		# and no need to (potentially) disable any drivers if it's not found.
+		have_libusb1_0="yes"
+		;;
+	*)
+		PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.16],
+			[have_libusb1_0="yes"; LIB_CFLAGS="$LIB_CFLAGS $libusb_CFLAGS";
+			LIBS="$LIBS $libusb_LIBS";
+			SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"],
+			[have_libusb1_0="no"])
+		if test "x$enable_libusb$have_libusb1_0" = "xyesno"; then
+			AC_MSG_ERROR([libusb support requested, but it was not found])
+		fi
+		;;
+	esac
+else
+	have_libusb1_0="no"
+fi
+
+# Define HAVE_LIBUSB_1_0 in config.h if we found libusb-1.0.
+if test "x$have_libusb1_0" = "xno"; then
+	HW_BRYMEN_BM86X="no"; HW_FX2LAFW="no";
+	HW_HANTEK_DSO="no"; HW_IKALOGIC_SCANALOGIC2="no";
+	HW_KECHENG_KC_330B="no"; HW_LASCAR_EL_USB="no";
+	HW_SYSCLK_LWLA="no"; HW_TESTO="no"; HW_UNI_T_DMM="no";
+	HW_UNI_T_UT32X="no"; HW_VICTOR_DMM="no";
+	HW_ZEROPLUS_LOGIC_CUBE="no"; HW_SALEAE_LOGIC16="no";
+else
 	AC_DEFINE_UNQUOTED(HAVE_LIBUSB_1_0, [1],
 		[Specifies whether we have a libusb.h header.])
-	;;
-*)
-	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"],
-		[have_libusb1_0="no"; HW_BRYMEN_BM86X="no"; HW_FX2LAFW="no";
-		HW_HANTEK_DSO="no"; HW_IKALOGIC_SCANALOGIC2="no";
-		HW_KECHENG_KC_330B="no"; HW_LASCAR_EL_USB="no";
-		HW_SYSCLK_LWLA="no"; HW_UNI_T_DMM="no";
-		HW_UNI_T_UT32X="no"; HW_VICTOR_DMM="no";
-		HW_ZEROPLUS_LOGIC_CUBE="no"; HW_SALEAE_LOGIC16="no"])
-
-	# Define HAVE_LIBUSB_1_0 in config.h if we found libusb-1.0.
-	if test "x$have_libusb1_0" != "xno"; then
-		AC_DEFINE_UNQUOTED(HAVE_LIBUSB_1_0, [1],
-			[Specifies whether we have a libusb.h header.])
-	fi
-	;;
-esac
+fi
 
 # USB + FX2 firmware helper code is only compiled in if libusb-1.0 was found.
 AM_CONDITIONAL(NEED_USB, test "x$have_libusb1_0" != xno)
 
 # libftdi is only needed for some hardware drivers. Disable them if not found.
-PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16],
-	[CFLAGS="$CFLAGS $libftdi_CFLAGS";
-	LIBS="$LIBS $libftdi_LIBS";
-	SR_PKGLIBS="$SR_PKGLIBS libftdi"],
-	[HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA="no"; HW_IKALOGIC_SCANAPLUS="no"])
-
-# libudev is only needed for some hardware drivers. Disable them if not found.
-PKG_CHECK_MODULES([libudev], [libudev >= 151],
-	[CFLAGS="$CFLAGS $libudev_CFLAGS"; LIBS="$LIBS $libudev_LIBS";
-	SR_PKGLIBS="$SR_PKGLIBS libudev"],
-	[HW_LINK_MSO19="no"])
+if test "x$enable_libftdi" != "xno"; then
+	PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16],
+		[have_libftdi="yes"; LIB_CFLAGS="$LIB_CFLAGS $libftdi_CFLAGS";
+		LIBS="$LIBS $libftdi_LIBS";
+		SR_PKGLIBS="$SR_PKGLIBS libftdi"],
+		[PKG_CHECK_MODULES([libftdi1], [libftdi1 >= 1.0],
+			[LIB_CFLAGS="$LIB_CFLAGS $libftdi1_CFLAGS";
+			LIBS="$LIBS $libftdi1_LIBS";
+			SR_PKGLIBS="$SR_PKGLIBS libftdi1"],
+			[have_libftdi="no"])])
+	if test "x$enable_libftdi$have_libftdi" = "xyesno"; then
+		AC_MSG_ERROR([libftdi support requested, but it was not found])
+	fi
+else
+	have_libftdi="no"
+fi
+
+if test "x$have_libftdi" = "xno"; then
+	HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA="no"; HW_IKALOGIC_SCANAPLUS="no";
+fi
 
 # The Check unit testing framework is optional. Disable if not found.
 PKG_CHECK_MODULES([check], [check >= 0.9.4],
-	[have_check="yes"; CFLAGS="$CFLAGS $check_CFLAGS";
-	LIBS="$LIBS $check_LIBS"], [have_check="no"])
+	[have_check="yes"], [have_check="no"])
 AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
 
 # The OLS driver uses serial port file descriptors directly, and therefore
 # will not currently work on Windows.
 case "$host" in
 *mingw*)
-       HW_OLS="no"
-       ;;
+	HW_OLS="no"
+	;;
 esac
 
 AC_SUBST(SR_PKGLIBS)
 
+CFLAGS="$CFLAGS $LIB_CFLAGS"
+
 # Now set AM_CONDITIONALs and AC_DEFINEs for the enabled/disabled drivers.
 
 AM_CONDITIONAL(HW_AGILENT_DMM, test x$HW_AGILENT_DMM = xyes)
@@ -417,7 +468,7 @@ fi
 
 AM_CONDITIONAL(HW_ATTEN_PPS3XXX, test x$HW_ATTEN_PPS3XXX = xyes)
 if test "x$HW_ATTEN_PPS3XXX" = "xyes"; then
-       AC_DEFINE(HAVE_HW_ATTEN_PPS3XXX, 1, [Atten PPS3xxx support])
+	AC_DEFINE(HAVE_HW_ATTEN_PPS3XXX, 1, [Atten PPS3xxx support])
 fi
 
 AM_CONDITIONAL(HW_BRYMEN_BM86X, test x$HW_BRYMEN_BM86X = xyes)
@@ -505,9 +556,9 @@ if test "x$HW_LASCAR_EL_USB" = "xyes"; then
 	AC_DEFINE(HAVE_HW_LASCAR_EL_USB, 1, [Lascar EL-USB support])
 fi
 
-AM_CONDITIONAL(HW_LINK_MSO19, test x$HW_LINK_MSO19 = xyes)
-if test "x$HW_LINK_MSO19" = "xyes"; then
-	AC_DEFINE(HAVE_HW_LINK_MSO19, 1, [Link Instruments MSO-19 support])
+AM_CONDITIONAL(HW_MANSON_HCS_3XXX, test x$HW_MANSON_HCS_3XXX = xyes)
+if test "x$HW_MANSON_HCS_3XXX" = "xyes"; then
+	AC_DEFINE(HAVE_HW_MANSON_HCS_3XXX, 1, [Manson HCS-3xxx support])
 fi
 
 AM_CONDITIONAL(HW_MIC_985XX, test x$HW_MIC_985XX = xyes)
@@ -515,9 +566,14 @@ if test "x$HW_MIC_985XX" = "xyes"; then
 	AC_DEFINE(HAVE_HW_MIC_985XX, 1, [MIC 985xx support])
 fi
 
+AM_CONDITIONAL(HW_MOTECH_LPS_30X, test x$HW_MOTECH_LPS_30X = xyes)
+if test "x$HW_MOTECH_LPS_30X" = "xyes"; then
+	AC_DEFINE(HAVE_HW_MOTECH_LPS_30X, 1, [motech-lps-30x support])
+fi
+
 AM_CONDITIONAL(HW_NORMA_DMM, test x$HW_NORMA_DMM = xyes)
 if test "x$HW_NORMA_DMM" = "xyes"; then
-       AC_DEFINE(HAVE_HW_NORMA_DMM, 1, [Norma DMM support])
+	AC_DEFINE(HAVE_HW_NORMA_DMM, 1, [Norma DMM support])
 fi
 
 AM_CONDITIONAL(HW_OLS, test x$HW_OLS = xyes)
@@ -550,6 +606,11 @@ if test "x$HW_TELEINFO" = "xyes"; then
 	AC_DEFINE(HAVE_HW_TELEINFO, 1, [Teleinfo support])
 fi
 
+AM_CONDITIONAL(HW_TESTO, test x$HW_TESTO = xyes)
+if test "x$HW_TESTO" = "xyes"; then
+	AC_DEFINE(HAVE_HW_TESTO, 1, [Testo support])
+fi
+
 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])
@@ -612,7 +673,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" "librevisa >= 0.0.20130812" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" "libudev >= 151" "check >= 0.9.4"; do
+for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.0" "librevisa >= 0.0.20130812" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" "libftdi1 >= 1.0" "check >= 0.9.4"; do
 	optional="OPTIONAL"
 	if test "x$lib" = "xglib-2.0 >= 2.32.0"; then optional="REQUIRED"; fi
 	if test "x$lib" = "xlibzip >= 0.10"; then optional="REQUIRED"; fi
@@ -647,8 +708,9 @@ echo "  - ikalogic-scanalogic2............ $HW_IKALOGIC_SCANALOGIC2"
 echo "  - ikalogic-scanaplus.............. $HW_IKALOGIC_SCANAPLUS"
 echo "  - kecheng-kc-330b................. $HW_KECHENG_KC_330B"
 echo "  - lascar-el-usb................... $HW_LASCAR_EL_USB"
-echo "  - link-mso19 (EXPERIMENTAL)....... $HW_LINK_MSO19"
+echo "  - manson-hcs-3xxx................. $HW_MANSON_HCS_3XXX"
 echo "  - mic-985xx....................... $HW_MIC_985XX"
+echo "  - motech-lps-30x.................. $HW_MOTECH_LPS_30X"
 echo "  - norma-dmm....................... $HW_NORMA_DMM"
 echo "  - openbench-logic-sniffer......... $HW_OLS"
 echo "  - rigol-ds........................ $HW_RIGOL_DS"
@@ -656,6 +718,7 @@ echo "  - saleae-logic16.................. $HW_SALEAE_LOGIC16"
 echo "  - serial-dmm...................... $HW_SERIAL_DMM"
 echo "  - sysclk-lwla..................... $HW_SYSCLK_LWLA"
 echo "  - teleinfo........................ $HW_TELEINFO"
+echo "  - testo........................... $HW_TESTO"
 echo "  - tondaj-sl-814................... $HW_TONDAJ_SL_814"
 echo "  - uni-t-dmm....................... $HW_UNI_T_DMM"
 echo "  - uni-t-ut32x..................... $HW_UNI_T_UT32X"