# 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],
# 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"
[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(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"],
[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
# 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"; LIB_CFLAGS="$LIB_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_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
# 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_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"; LIB_CFLAGS="$LIB_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],
- [LIB_CFLAGS="$LIB_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],
- [LIB_CFLAGS="$LIB_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"],
+ [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"; LIB_CFLAGS="$LIB_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)
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)
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])
-fi
-
AM_CONDITIONAL(HW_MIC_985XX, test x$HW_MIC_985XX = xyes)
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)
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" "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
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 " - 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"
projects / libsigrok.git / blobdiff