X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=d28306149760eabaddcd394f393d3cd2bab5056b;hb=390795c0999ae3a41b97f9a8e2c154c81e6d064e;hp=bb0bed8c9a2a52466aed803301b9ba2b28c847de;hpb=d3619a9b63f49a07795d91c130b37df4857843f8;p=libsigrok.git diff --git a/configure.ac b/configure.ac index bb0bed8c..d2830614 100644 --- a/configure.ac +++ b/configure.ac @@ -114,6 +114,7 @@ DRIVER([Center 3xx], [center-3xx]) DRIVER([ChronoVu LA], [chronovu-la]) DRIVER([Colead SLM], [colead-slm]) DRIVER([Conrad DIGI 35 CPU], [conrad-digi-35-cpu]) +DRIVER([DER EE DE-5000], [deree-de5000]) DRIVER([demo], [demo]) DRIVER([Fluke DMM], [fluke-dmm]) DRIVER([fx2lafw], [fx2lafw]) @@ -199,10 +200,8 @@ if test "x$HAVE_DOXYGEN" != "xyes"; then fi # Python is needed for the C++ bindings. -AC_CHECK_PROG([HAVE_PYTHON], [python], [yes]) -if test "x$HAVE_PYTHON" != "xyes"; then - BINDINGS_CXX="no"; cxx_msg="Python required" -fi +AM_PATH_PYTHON([2.7], [HAVE_PYTHON="yes"], + [HAVE_PYTHON="no"; BINDINGS_CXX="no"; cxx_msg="Python required"]) # The Python bindings need Python development files. PKG_CHECK_MODULES([python], [python >= 2.7], @@ -261,8 +260,8 @@ AM_CONDITIONAL(NEED_RPC, test "x$have_rpc" != "x0") # libglib-2.0 is always needed. Abort if it's not found. # 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], +# We require at least 2.34.0 due to e.g. g_slist_deep_copy(). +AM_PATH_GLIB_2_0([2.34.0], [LIB_CFLAGS="$LIB_CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"]) # libzip is always needed. Abort if it's not found. @@ -288,9 +287,10 @@ 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_OPENBENCH_LOGIC_SNIFFER="no"; HW_SERIAL_DMM="no"; + HW_DEREE_DE5000="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_OPENBENCH_LOGIC_SNIFFER="no"; HW_SERIAL_DMM="no"; HW_TELEINFO="no"; HW_TONDAJ_SL_814="no"; else # Define HAVE_LIBSERIALPORT in config.h if we found libserialport. @@ -423,14 +423,6 @@ PKG_CHECK_MODULES([check], [check >= 0.9.4], [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_OPENBENCH_LOGIC_SNIFFER="no" - ;; -esac - # The BeagleLogic driver needs sys/mman.h and sys/ioctl.h. Don't try to # build it if these headers aren't available. AC_CHECK_HEADERS([sys/mman.h sys/ioctl.h], [], [HW_BEAGLELOGIC="no"]) @@ -469,128 +461,53 @@ fi # Now set AM_CONDITIONALs and AC_DEFINEs for the enabled/disabled drivers. -AM_CONDITIONAL(HW_AGILENT_DMM, test x$HW_AGILENT_DMM = xyes) -if test "x$HW_AGILENT_DMM" = "xyes"; then AC_DEFINE(HAVE_HW_AGILENT_DMM, 1, [.]) 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, [.]) 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, [.]) 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, [.]) fi - -AM_CONDITIONAL(HW_BEAGLELOGIC, test x$HW_BEAGLELOGIC = xyes) -if test "x$HW_BEAGLELOGIC" = "xyes"; then AC_DEFINE(HAVE_HW_BEAGLELOGIC, 1, [.]) fi - -AM_CONDITIONAL(HW_BRYMEN_BM86X, test x$HW_BRYMEN_BM86X = xyes) -if test "x$HW_BRYMEN_BM86X" = "xyes"; then AC_DEFINE(HAVE_HW_BRYMEN_BM86X, 1, [.]) fi - -AM_CONDITIONAL(HW_BRYMEN_DMM, test x$HW_BRYMEN_DMM = xyes) -if test "x$HW_BRYMEN_DMM" = "xyes"; then AC_DEFINE(HAVE_HW_BRYMEN_DMM, 1, [.]) fi - -AM_CONDITIONAL(HW_CEM_DT_885X, test x$HW_CEM_DT_885X = xyes) -if test "x$HW_CEM_DT_885X" = "xyes"; then AC_DEFINE(HAVE_HW_CEM_DT_885X, 1, [.]) fi - -AM_CONDITIONAL(HW_CENTER_3XX, test x$HW_CENTER_3XX = xyes) -if test "x$HW_CENTER_3XX" = "xyes"; then AC_DEFINE(HAVE_HW_CENTER_3XX, 1, [.]) fi - -AM_CONDITIONAL(HW_CHRONOVU_LA, test x$HW_CHRONOVU_LA = xyes) -if test "x$HW_CHRONOVU_LA" = "xyes"; then AC_DEFINE(HAVE_HW_CHRONOVU_LA, 1, [.]) fi - -AM_CONDITIONAL(HW_COLEAD_SLM, test x$HW_COLEAD_SLM = xyes) -if test "x$HW_COLEAD_SLM" = "xyes"; then AC_DEFINE(HAVE_HW_COLEAD_SLM, 1, [.]) fi - -AM_CONDITIONAL(HW_CONRAD_DIGI_35_CPU, test x$HW_CONRAD_DIGI_35_CPU = xyes) -if test "x$HW_CONRAD_DIGI_35_CPU" = "xyes"; then AC_DEFINE(HAVE_HW_CONRAD_DIGI_35_CPU, 1, [.]) fi - -AM_CONDITIONAL(HW_DEMO, test x$HW_DEMO = xyes) -if test "x$HW_DEMO" = "xyes"; then AC_DEFINE(HAVE_HW_DEMO, 1, [.]) fi - -AM_CONDITIONAL(HW_FLUKE_DMM, test x$HW_FLUKE_DMM = xyes) -if test "x$HW_FLUKE_DMM" = "xyes"; then AC_DEFINE(HAVE_HW_FLUKE_DMM, 1, [.]) fi - -AM_CONDITIONAL(HW_FX2LAFW, test x$HW_FX2LAFW = xyes) -if test "x$HW_FX2LAFW" = "xyes"; then AC_DEFINE(HAVE_HW_FX2LAFW, 1, [.]) fi - -AM_CONDITIONAL(HW_GMC_MH_1X_2X, test x$HW_GMC_MH_1X_2X = xyes) -if test "x$HW_GMC_MH_1X_2X" = "xyes"; then AC_DEFINE(HAVE_HW_GMC_MH_1X_2X, 1, [.]) fi - -AM_CONDITIONAL(HW_HAMEG_HMO, test x$HW_HAMEG_HMO = xyes) -if test "x$HW_HAMEG_HMO" = "xyes"; then AC_DEFINE(HAVE_HW_HAMEG_HMO, 1, [.]) fi - -AM_CONDITIONAL(HW_HANTEK_DSO, test x$HW_HANTEK_DSO = xyes) -if test "x$HW_HANTEK_DSO" = "xyes"; then AC_DEFINE(HAVE_HW_HANTEK_DSO, 1, [.]) fi - -AM_CONDITIONAL(HW_IKALOGIC_SCANALOGIC2, test x$HW_IKALOGIC_SCANALOGIC2 = xyes) -if test "x$HW_IKALOGIC_SCANALOGIC2" = "xyes"; then AC_DEFINE(HAVE_HW_IKALOGIC_SCANALOGIC2, 1, [.]) fi - -AM_CONDITIONAL(HW_IKALOGIC_SCANAPLUS, test x$HW_IKALOGIC_SCANAPLUS = xyes) -if test "x$HW_IKALOGIC_SCANAPLUS" = "xyes"; then AC_DEFINE(HAVE_HW_IKALOGIC_SCANAPLUS, 1, [.]) fi - -AM_CONDITIONAL(HW_KECHENG_KC_330B, test x$HW_KECHENG_KC_330B = xyes) -if test "x$HW_KECHENG_KC_330B" = "xyes"; then AC_DEFINE(HAVE_HW_KECHENG_KC_330B, 1, [.]) fi - -AM_CONDITIONAL(HW_LASCAR_EL_USB, test x$HW_LASCAR_EL_USB = xyes) -if test "x$HW_LASCAR_EL_USB" = "xyes"; then AC_DEFINE(HAVE_HW_LASCAR_EL_USB, 1, [.]) fi - -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, [.]) 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, [.]) 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, [.]) 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, [.]) fi - -AM_CONDITIONAL(HW_OPENBENCH_LOGIC_SNIFFER, test x$HW_OPENBENCH_LOGIC_SNIFFER = xyes) -if test "x$HW_OPENBENCH_LOGIC_SNIFFER" = "xyes"; then AC_DEFINE(HAVE_HW_OPENBENCH_LOGIC_SNIFFER, 1, [.]) fi - -AM_CONDITIONAL(HW_PIPISTRELLO_OLS, test x$HW_PIPISTRELLO_OLS = xyes) -if test "x$HW_PIPISTRELLO_OLS" = "xyes"; then AC_DEFINE(HAVE_HW_PIPISTRELLO_OLS, 1, [.]) fi - -AM_CONDITIONAL(HW_RIGOL_DS, test x$HW_RIGOL_DS = xyes) -if test "x$HW_RIGOL_DS" = "xyes"; then AC_DEFINE(HAVE_HW_RIGOL_DS, 1, [.]) 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, [.]) fi - -AM_CONDITIONAL(HW_SCPI_PPS, test x$HW_SCPI_PPS = xyes) -if test "x$HW_SCPI_PPS" = "xyes"; then AC_DEFINE(HAVE_HW_SCPI_PPS, 1, [.]) 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, [.]) fi - -AM_CONDITIONAL(HW_SYSCLK_LWLA, test x$HW_SYSCLK_LWLA = xyes) -if test "x$HW_SYSCLK_LWLA" = "xyes"; then AC_DEFINE(HAVE_HW_SYSCLK_LWLA, 1, [.]) fi - -AM_CONDITIONAL(HW_TELEINFO, test x$HW_TELEINFO = xyes) -if test "x$HW_TELEINFO" = "xyes"; then AC_DEFINE(HAVE_HW_TELEINFO, 1, [.]) fi - -AM_CONDITIONAL(HW_TESTO, test x$HW_TESTO = xyes) -if test "x$HW_TESTO" = "xyes"; then AC_DEFINE(HAVE_HW_TESTO, 1, [.]) 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, [.]) fi - -AM_CONDITIONAL(HW_UNI_T_DMM, test x$HW_UNI_T_DMM = xyes) -if test "x$HW_UNI_T_DMM" = "xyes"; then AC_DEFINE(HAVE_HW_UNI_T_DMM, 1, [.]) fi - -AM_CONDITIONAL(HW_UNI_T_UT32X, test x$HW_UNI_T_UT32X = xyes) -if test "x$HW_UNI_T_UT32X" = "xyes"; then AC_DEFINE(HAVE_HW_UNI_T_UT32X, 1, [.]) fi - -AM_CONDITIONAL(HW_VICTOR_DMM, test x$HW_VICTOR_DMM = xyes) -if test "x$HW_VICTOR_DMM" = "xyes"; then AC_DEFINE(HAVE_HW_VICTOR_DMM, 1, [.]) fi - -AM_CONDITIONAL(HW_YOKOGAWA_DLM, test x$HW_YOKOGAWA_DLM = xyes) -if test "x$HW_YOKOGAWA_DLM" = "xyes"; then AC_DEFINE(HAVE_HW_YOKOGAWA_DLM, 1, [.]) fi +AC_DEFUN([DRIVER2], [ + AM_CONDITIONAL($1, test "x$2" = "xyes") + if test "x$2" = "xyes"; then AC_DEFINE($3, 1, [.]) fi +]) -AM_CONDITIONAL(HW_ZEROPLUS_LOGIC_CUBE, test x$HW_ZEROPLUS_LOGIC_CUBE = xyes) -if test "x$HW_ZEROPLUS_LOGIC_CUBE" = "xyes"; then AC_DEFINE(HAVE_HW_ZEROPLUS_LOGIC_CUBE, 1, [.]) fi +DRIVER2([HW_AGILENT_DMM], [$HW_AGILENT_DMM], [HAVE_HW_AGILENT_DMM]) +DRIVER2([HW_APPA_55II], [$HW_APPA_55II], [HAVE_HW_APPA_55II]) +DRIVER2([HW_ASIX_SIGMA], [$HW_ASIX_SIGMA], [HAVE_HW_ASIX_SIGMA]) +DRIVER2([HW_ATTEN_PPS3XXX], [$HW_ATTEN_PPS3XXX], [HAVE_HW_ATTEN_PPS3XXX]) +DRIVER2([HW_BEAGLELOGIC], [$HW_BEAGLELOGIC], [HAVE_HW_BEAGLELOGIC]) +DRIVER2([HW_BRYMEN_BM86X], [$HW_BRYMEN_BM86X], [HAVE_HW_BRYMEN_BM86X]) +DRIVER2([HW_BRYMEN_DMM], [$HW_BRYMEN_DMM], [HAVE_HW_BRYMEN_DMM]) +DRIVER2([HW_CEM_DT_885X], [$HW_CEM_DT_885X], [HAVE_HW_CEM_DT_885X]) +DRIVER2([HW_CENTER_3XX], [$HW_CENTER_3XX], [HAVE_HW_CENTER_3XX]) +DRIVER2([HW_CHRONOVU_LA], [$HW_CHRONOVU_LA], [HAVE_HW_CHRONOVU_LA]) +DRIVER2([HW_COLEAD_SLM], [$HW_COLEAD_SLM], [HAVE_HW_COLEAD_SLM]) +DRIVER2([HW_CONRAD_DIGI_35_CPU], [$HW_CONRAD_DIGI_35_CPU], [HAVE_HW_CONRAD_DIGI_35_CPU]) +DRIVER2([HW_DEMO], [$HW_DEMO], [HAVE_HW_DEMO]) +DRIVER2([HW_DEREE_DE5000], [$HW_DEREE_DE5000], [HAVE_HW_DEREE_DE5000]) +DRIVER2([HW_FLUKE_DMM], [$HW_FLUKE_DMM], [HAVE_HW_FLUKE_DMM]) +DRIVER2([HW_FX2LAFW], [$HW_FX2LAFW], [HAVE_HW_FX2LAFW]) +DRIVER2([HW_GMC_MH_1X_2X], [$HW_GMC_MH_1X_2X], [HAVE_HW_GMC_MH_1X_2X]) +DRIVER2([HW_HAMEG_HMO], [$HW_HAMEG_HMO], [HAVE_HW_HAMEG_HMO]) +DRIVER2([HW_HANTEK_DSO], [$HW_HANTEK_DSO], [HAVE_HW_HANTEK_DSO]) +DRIVER2([HW_IKALOGIC_SCANALOGIC2], [$HW_IKALOGIC_SCANALOGIC2], [HAVE_HW_IKALOGIC_SCANALOGIC2]) +DRIVER2([HW_IKALOGIC_SCANAPLUS], [$HW_IKALOGIC_SCANAPLUS], [HAVE_HW_IKALOGIC_SCANAPLUS]) +DRIVER2([HW_KECHENG_KC_330B], [$HW_KECHENG_KC_330B], [HAVE_HW_KECHENG_KC_330B]) +DRIVER2([HW_LASCAR_EL_USB], [$HW_LASCAR_EL_USB], [HAVE_HW_LASCAR_EL_USB]) +DRIVER2([HW_MANSON_HCS_3XXX], [$HW_MANSON_HCS_3XXX], [HAVE_HW_MANSON_HCS_3XXX]) +DRIVER2([HW_MIC_985XX], [$HW_MIC_985XX], [HAVE_HW_MIC_985XX]) +DRIVER2([HW_MOTECH_LPS_30X], [$HW_MOTECH_LPS_30X], [HAVE_HW_MOTECH_LPS_30X]) +DRIVER2([HW_NORMA_DMM], [$HW_NORMA_DMM], [HAVE_HW_NORMA_DMM]) +DRIVER2([HW_OPENBENCH_LOGIC_SNIFFER], [$HW_OPENBENCH_LOGIC_SNIFFER], [HAVE_HW_OPENBENCH_LOGIC_SNIFFER]) +DRIVER2([HW_PIPISTRELLO_OLS], [$HW_PIPISTRELLO_OLS], [HAVE_HW_PIPISTRELLO_OLS]) +DRIVER2([HW_RIGOL_DS], [$HW_RIGOL_DS], [HAVE_HW_RIGOL_DS]) +DRIVER2([HW_SALEAE_LOGIC16], [$HW_SALEAE_LOGIC16], [HAVE_HW_SALEAE_LOGIC16]) +DRIVER2([HW_SCPI_PPS], [$HW_SCPI_PPS], [HAVE_HW_SCPI_PPS]) +DRIVER2([HW_SERIAL_DMM], [$HW_SERIAL_DMM], [HAVE_HW_SERIAL_DMM]) +DRIVER2([HW_SYSCLK_LWLA], [$HW_SYSCLK_LWLA], [HAVE_HW_SYSCLK_LWLA]) +DRIVER2([HW_TELEINFO], [$HW_TELEINFO], [HAVE_HW_TELEINFO]) +DRIVER2([HW_TESTO], [$HW_TESTO], [HAVE_HW_TESTO]) +DRIVER2([HW_TONDAJ_SL_814], [$HW_TONDAJ_SL_814], [HAVE_HW_TONDAJ_SL_814]) +DRIVER2([HW_UNI_T_DMM], [$HW_UNI_T_DMM], [HAVE_HW_UNI_T_DMM]) +DRIVER2([HW_UNI_T_UT32X], [$HW_UNI_T_UT32X], [HAVE_HW_UNI_T_UT32X]) +DRIVER2([HW_VICTOR_DMM], [$HW_VICTOR_DMM], [HAVE_HW_VICTOR_DMM]) +DRIVER2([HW_YOKOGAWA_DLM], [$HW_YOKOGAWA_DLM], [HAVE_HW_YOKOGAWA_DLM]) +DRIVER2([HW_ZEROPLUS_LOGIC_CUBE], [$HW_ZEROPLUS_LOGIC_CUBE], [HAVE_HW_ZEROPLUS_LOGIC_CUBE]) AM_CONDITIONAL(BINDINGS_CXX, test x$BINDINGS_CXX = xyes) @@ -637,13 +554,13 @@ 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.2.0" \ +for lib in "glib-2.0 >= 2.34.0" "libzip >= 0.10" "libserialport >= 0.2.0" \ "librevisa >= 0.0.20130812" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" \ "libftdi1 >= 1.0" "libgpib" "glibmm-2.4 >= 2.32.0" \ "pygobject-3.0 >= 3.0.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" = "xglib-2.0 >= 2.34.0"; then optional="REQUIRED"; fi if test "x$lib" = "xlibzip >= 0.10"; then optional="REQUIRED"; fi if `$PKG_CONFIG --exists $lib`; then ver=`$PKG_CONFIG --modversion $lib`