X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=467ebfc80cddda61eadb25737b69ad53fa117b1c;hb=360079e78efaa44142458dde329042b97da68a87;hp=fb4deaae14858db5641836bc526e4c1c12812104;hpb=c463dcf06cdeb7f6ec0d2bafda707cce3a486bf0;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index fb4deaae..467ebfc8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ 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], [1])
+m4_define([sr_package_version_micro], [2])
 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],
@@ -67,7 +67,7 @@ PKG_PROG_PKG_CONFIG([0.22])
 # 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=1
+SR_LIB_VERSION_REVISION=2
 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"
@@ -107,12 +107,12 @@ AC_ARG_ENABLE(brymen-dmm, AC_HELP_STRING([--enable-brymen-dmm],
 AC_ARG_ENABLE(cem-dt-885x, AC_HELP_STRING([--enable-cem-dt-885x],
 	[enable CEM DT-885x support [default=yes]]),
 	[HW_CEM_DT_885X="$enableval"],
-	[HW_CEM_DT_885X=yes])
+	[HW_CEM_DT_885X=$HW_ENABLED_DEFAULT])
 
 AC_ARG_ENABLE(center-3xx, AC_HELP_STRING([--enable-center-3xx],
 	[enable Center 3xx support [default=yes]]),
 	[HW_CENTER_3XX="$enableval"],
-	[HW_CENTER_3XX=yes])
+	[HW_CENTER_3XX=$HW_ENABLED_DEFAULT])
 
 AC_ARG_ENABLE(chronovu-la8, AC_HELP_STRING([--enable-chronovu-la8],
 	[enable ChronoVu LA8 support [default=yes]]),
@@ -147,17 +147,17 @@ AC_ARG_ENABLE(hantek-dso, AC_HELP_STRING([--enable-hantek-dso],
 AC_ARG_ENABLE(ikalogic-scanalogic2, AC_HELP_STRING([--enable-ikalogic-scanalogic2],
 	[enable IKALOGIC Scanalogic-2 support [default=yes]]),
 	[HW_IKALOGIC_SCANALOGIC2="$enableval"],
-	[HW_IKALOGIC_SCANALOGIC2=yes])
+	[HW_IKALOGIC_SCANALOGIC2=$HW_ENABLED_DEFAULT])
 
 AC_ARG_ENABLE(ikalogic-scanaplus, AC_HELP_STRING([--enable-ikalogic-scanaplus],
 	[enable IKALOGIC ScanaPLUS support [default=yes]]),
 	[HW_IKALOGIC_SCANAPLUS="$enableval"],
-	[HW_IKALOGIC_SCANAPLUS=yes])
+	[HW_IKALOGIC_SCANAPLUS=$HW_ENABLED_DEFAULT])
 
 AC_ARG_ENABLE(kecheng-kc-330b, AC_HELP_STRING([--enable-kecheng-kc-330b],
 	[enable Kecheng KC-330B support [default=yes]]),
 	[HW_KECHENG_KC_330B="$enableval"],
-	[HW_KECHENG_KC_330B=yes])
+	[HW_KECHENG_KC_330B=$HW_ENABLED_DEFAULT])
 
 AC_ARG_ENABLE(lascar-el-usb, AC_HELP_STRING([--enable-lascar-el-usb],
 	[enable Lascar EL-USB support [default=yes]]),
@@ -174,6 +174,11 @@ AC_ARG_ENABLE(mic-985xx, AC_HELP_STRING([--enable-mic-985xx],
 	[HW_MIC_985XX="$enableval"],
 	[HW_MIC_985XX=$HW_ENABLED_DEFAULT])
 
+AC_ARG_ENABLE(norma-dmm, AC_HELP_STRING([--enable-norma-dmm],
+	[enable Norma DMM support [default=yes]]),
+	[HW_NORMA_DMM="$enableval"],
+	[HW_NORMA_DMM=$HW_ENABLED_DEFAULT])
+
 AC_ARG_ENABLE(ols, AC_HELP_STRING([--enable-ols],
 	[enable OpenBench Logic Sniffer (OLS) support [default=yes]]),
 	[HW_OLS="$enableval"],
@@ -187,17 +192,18 @@ AC_ARG_ENABLE(rigol-ds1xx2, AC_HELP_STRING([--enable-rigol-ds1xx2],
 AC_ARG_ENABLE(saleae-logic16, AC_HELP_STRING([--enable-saleae-logic16],
 	[enable Saleae Logic16 support [default=yes]]),
 	[HW_SALEAE_LOGIC16="$enableval"],
-	[HW_SALEAE_LOGIC16=yes])
-AM_CONDITIONAL(HW_SALEAE_LOGIC16, test x$HW_SALEAE_LOGIC16 = xyes)
-if test "x$HW_SALEAE_LOGIC16" = "xyes"; then
-	AC_DEFINE(HAVE_HW_SALEAE_LOGIC16, 1, [Saleae Logic16 support])
-fi
+	[HW_SALEAE_LOGIC16=$HW_ENABLED_DEFAULT])
 
 AC_ARG_ENABLE(serial-dmm, AC_HELP_STRING([--enable-serial-dmm],
 	[enable serial DMM support [default=yes]]),
 	[HW_SERIAL_DMM="$enableval"],
 	[HW_SERIAL_DMM=$HW_ENABLED_DEFAULT])
 
+AC_ARG_ENABLE(teleinfo, AC_HELP_STRING([--enable-teleinfo],
+	[enable Teleinfo support [default=yes]]),
+	[HW_TELEINFO="$enableval"],
+	[HW_TELEINFO=$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"],
@@ -211,7 +217,7 @@ AC_ARG_ENABLE(uni-t-dmm, AC_HELP_STRING([--enable-uni-t-dmm],
 AC_ARG_ENABLE(uni-t-ut32x, AC_HELP_STRING([--enable-uni-t-ut32x],
 	[enable UNI-T UT32x support [default=yes]]),
 	[HW_UNI_T_UT32X="$enableval"],
-	[HW_UNI_T_UT32X=yes])
+	[HW_UNI_T_UT32X=$HW_ENABLED_DEFAULT])
 
 AC_ARG_ENABLE(victor-dmm, AC_HELP_STRING([--enable-victor-dmm],
 	[enable victor-dmm support [default=yes]]),
@@ -241,7 +247,7 @@ AM_PATH_GLIB_2_0([2.32.0],
 	[CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 
 # libzip is always needed. Abort if it's not found.
-PKG_CHECK_MODULES([libzip], [libzip >= 0.8],
+PKG_CHECK_MODULES([libzip], [libzip >= 0.10],
 	[CFLAGS="$CFLAGS $libzip_CFLAGS"; LIBS="$LIBS $libzip_LIBS";
 	SR_PKGLIBS="$SR_PKGLIBS libzip"])
 
@@ -263,8 +269,8 @@ case "$host" in
 		[have_libusb1_0="no"; HW_FX2LAFW="no"; HW_HANTEK_DSO="no";
 		HW_IKALOGIC_SCANALOGIC2="no"; HW_KECHENG_KC_330B="no";
 		HW_LASCAR_EL_USB="no";
-		HW_UNI_T_DMM="no"; HW_VICTOR_DMM="no";
-		HW_ZEROPLUS_LOGIC_CUBE="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
@@ -411,6 +417,11 @@ if test "x$HW_MIC_985XX" = "xyes"; then
 	AC_DEFINE(HAVE_HW_MIC_985XX, 1, [MIC 985xx 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])
+fi
+
 AM_CONDITIONAL(HW_OLS, test x$HW_OLS = xyes)
 if test "x$HW_OLS" = "xyes"; then
 	AC_DEFINE(HAVE_HW_OLS, 1, [OpenBench Logic Sniffer (OLS) support])
@@ -421,11 +432,21 @@ if test "x$HW_RIGOL_DS1XX2" = "xyes"; then
 	AC_DEFINE(HAVE_HW_RIGOL_DS1XX2, 1, [Rigol DS1xx2 support])
 fi
 
+AM_CONDITIONAL(HW_SALEAE_LOGIC16, test x$HW_SALEAE_LOGIC16 = xyes)
+if test "x$HW_SALEAE_LOGIC16" = "xyes"; then
+	AC_DEFINE(HAVE_HW_SALEAE_LOGIC16, 1, [Saleae Logic16 support])
+fi
+
 AM_CONDITIONAL(HW_SERIAL_DMM, test x$HW_SERIAL_DMM = xyes)
 if test "x$HW_SERIAL_DMM" = "xyes"; then
 	AC_DEFINE(HAVE_HW_SERIAL_DMM, 1, [Serial DMM support])
 fi
 
+AM_CONDITIONAL(HW_TELEINFO, test x$HW_TELEINFO = xyes)
+if test "x$HW_TELEINFO" = "xyes"; then
+	AC_DEFINE(HAVE_HW_TELEINFO, 1, [Teleinfo 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])
@@ -456,6 +477,7 @@ fi
 AC_CHECK_HEADERS([fcntl.h sys/time.h termios.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
+AC_C_BIGENDIAN
 AC_C_INLINE
 AC_TYPE_INT8_T
 AC_TYPE_INT16_T
@@ -501,6 +523,7 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
 		 hardware/mic-985xx/Makefile
 		 hardware/rigol-ds1xx2/Makefile
 		 hardware/saleae-logic16/Makefile
+		 hardware/teleinfo/Makefile
 		 hardware/tondaj-sl-814/Makefile
 		 hardware/victor-dmm/Makefile
 		 hardware/common/dmm/Makefile
@@ -509,6 +532,7 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
 		 hardware/fx2lafw/Makefile
 		 hardware/hantek-dso/Makefile
 		 hardware/link-mso19/Makefile
+		 hardware/norma-dmm/Makefile
 		 hardware/openbench-logic-sniffer/Makefile
 		 hardware/serial-dmm/Makefile
 		 hardware/uni-t-dmm/Makefile
@@ -537,7 +561,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.8" "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" "libusb-1.0 >= 1.0.9" "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)"
@@ -566,10 +590,12 @@ echo "  - kecheng-kc-330b................. $HW_KECHENG_KC_330B"
 echo "  - lascar-el-usb................... $HW_LASCAR_EL_USB"
 echo "  - link-mso19 (EXPERIMENTAL)....... $HW_LINK_MSO19"
 echo "  - mic-985xx....................... $HW_MIC_985XX"
+echo "  - norma-dmm....................... $HW_NORMA_DMM"
 echo "  - openbench-logic-sniffer......... $HW_OLS"
 echo "  - rigol-ds1xx2.................... $HW_RIGOL_DS1XX2"
 echo "  - saleae-logic16.................. $HW_SALEAE_LOGIC16"
 echo "  - serial-dmm...................... $HW_SERIAL_DMM"
+echo "  - teleinfo........................ $HW_TELEINFO"
 echo "  - tondaj-sl-814................... $HW_TONDAJ_SL_814"
 echo "  - uni-t-dmm....................... $HW_UNI_T_DMM"
 echo "  - uni-t-ut32x..................... $HW_UNI_T_UT32X"