X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=496bc7a2e2e622aaacd1509fd03083251f6bf17b;hb=7b5e6d2978b9fe7afa952b7fa9f8837c87e8ed26;hp=845ef35812edf33a6ef0b6b23d01e0fd4a3a791f;hpb=85ca913cae0d9514949db8f638ecb4ef7bca706e;p=libsigrok.git diff --git a/configure.ac b/configure.ac index 845ef358..496bc7a2 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], @@ -195,6 +195,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(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"], @@ -305,8 +310,9 @@ PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.0], 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_MIC_985XX="no"; HW_NORMA_DMM="no"; HW_OLS="no"; - HW_SERIAL_DMM="no"; HW_TELEINFO="no"; HW_TONDAJ_SL_814="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"]) # Define HAVE_LIBSERIALPORT in config.h if we found libserialport. if test "x$have_libserialport" != "xno"; then @@ -382,8 +388,8 @@ AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes") # will not currently work on Windows. case "$host" in *mingw*) - HW_OLS="no" - ;; + HW_OLS="no" + ;; esac AC_SUBST(SR_PKGLIBS) @@ -409,7 +415,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) @@ -502,9 +508,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) @@ -635,6 +646,7 @@ echo " - ikalogic-scanaplus.............. $HW_IKALOGIC_SCANAPLUS" echo " - kecheng-kc-330b................. $HW_KECHENG_KC_330B" echo " - lascar-el-usb................... $HW_LASCAR_EL_USB" 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"