X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=3847d17f38963208e076d66ff1416d8df3c3cb98;hb=ce95428cca4ee7f8263389dd44a02d228d2be88e;hp=7be2dfff9dd143ae265de482fa2ba0ef386178cc;hpb=63cbeaeb597450a52086ff23839f5dbf8989a8a2;p=libsigrok.git diff --git a/configure.ac b/configure.ac index 7be2dfff..3847d17f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ ## -## This file is part of the sigrok project. +## This file is part of the libsigrok project. ## ## Copyright (C) 2010-2012 Bert Vermeulen ## Copyright (C) 2012 Alexandru Gagniuc @@ -66,7 +66,7 @@ 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=2 +SR_LIB_VERSION_CURRENT=1 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" @@ -96,18 +96,23 @@ AC_ARG_ENABLE(alsa, AC_HELP_STRING([--enable-alsa], AC_ARG_ENABLE(asix-sigma, AC_HELP_STRING([--enable-asix-sigma], [enable ASIX SIGMA/SIGMA2 support [default=yes]]), - [LA_ASIX_SIGMA="$enableval"], - [LA_ASIX_SIGMA=$HW_ENABLED_DEFAULT]) + [HW_ASIX_SIGMA="$enableval"], + [HW_ASIX_SIGMA=$HW_ENABLED_DEFAULT]) AC_ARG_ENABLE(brymen-dmm, AC_HELP_STRING([--enable-brymen-dmm], [enable Brymen DMM support [default=yes]]), [HW_BRYMEN_DMM="$enableval"], [HW_BRYMEN_DMM=$HW_ENABLED_DEFAULT]) +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]) + AC_ARG_ENABLE(chronovu-la8, AC_HELP_STRING([--enable-chronovu-la8], [enable ChronoVu LA8 support [default=yes]]), - [LA_CHRONOVU_LA8="$enableval"], - [LA_CHRONOVU_LA8=$HW_ENABLED_DEFAULT]) + [HW_CHRONOVU_LA8="$enableval"], + [HW_CHRONOVU_LA8=$HW_ENABLED_DEFAULT]) AC_ARG_ENABLE(colead-slm, AC_HELP_STRING([--enable-colead-slm], [enable Colead SLM support [default=yes]]), @@ -116,8 +121,8 @@ AC_ARG_ENABLE(colead-slm, AC_HELP_STRING([--enable-colead-slm], AC_ARG_ENABLE(demo, AC_HELP_STRING([--enable-demo], [enable demo driver support [default=yes]]), - [LA_DEMO="$enableval"], - [LA_DEMO=$HW_ENABLED_DEFAULT]) + [HW_DEMO="$enableval"], + [HW_DEMO=$HW_ENABLED_DEFAULT]) AC_ARG_ENABLE(fluke-dmm, AC_HELP_STRING([--enable-fluke-dmm], [enable Fluke DMM support [default=yes]]), @@ -126,38 +131,48 @@ AC_ARG_ENABLE(fluke-dmm, AC_HELP_STRING([--enable-fluke-dmm], AC_ARG_ENABLE(fx2lafw, AC_HELP_STRING([--enable-fx2lafw], [enable fx2lafw support (for FX2 LAs). [default=yes]]), - [LA_FX2LAFW="$enableval"], - [LA_FX2LAFW=$HW_ENABLED_DEFAULT]) + [HW_FX2LAFW="$enableval"], + [HW_FX2LAFW=$HW_ENABLED_DEFAULT]) AC_ARG_ENABLE(hantek-dso, AC_HELP_STRING([--enable-hantek-dso], [enable Hantek DSO support [default=yes]]), [HW_HANTEK_DSO="$enableval"], [HW_HANTEK_DSO=$HW_ENABLED_DEFAULT]) +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]) + +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]) + +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]) + AC_ARG_ENABLE(lascar-el-usb, AC_HELP_STRING([--enable-lascar-el-usb], [enable Lascar EL-USB support [default=yes]]), [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=yes]]), - [LA_LINK_MSO19="$enableval"], - [LA_LINK_MSO19=$HW_ENABLED_DEFAULT]) + [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(nexus-osciprime, AC_HELP_STRING([--enable-nexus-osciprime], - [enable Nexus Osciprime support [default=yes]]), - [HW_NEXUS_OSCIPRIME="$enableval"], - [HW_NEXUS_OSCIPRIME=$HW_ENABLED_DEFAULT]) - AC_ARG_ENABLE(ols, AC_HELP_STRING([--enable-ols], [enable OpenBench Logic Sniffer (OLS) support [default=yes]]), - [LA_OLS="$enableval"], - [LA_OLS=$HW_ENABLED_DEFAULT]) + [HW_OLS="$enableval"], + [HW_OLS=$HW_ENABLED_DEFAULT]) AC_ARG_ENABLE(rigol-ds1xx2, AC_HELP_STRING([--enable-rigol-ds1xx2], [enable Rigol DS1xx2 support [default=yes]]), @@ -187,8 +202,8 @@ AC_ARG_ENABLE(victor-dmm, AC_HELP_STRING([--enable-victor-dmm], AC_ARG_ENABLE(zeroplus-logic-cube, AC_HELP_STRING([--enable-zeroplus-logic-cube], [enable ZEROPLUS Logic Cube support [default=yes]]), - [LA_ZEROPLUS_LOGIC_CUBE="$enableval"], - [LA_ZEROPLUS_LOGIC_CUBE=$HW_ENABLED_DEFAULT]) + [HW_ZEROPLUS_LOGIC_CUBE="$enableval"], + [HW_ZEROPLUS_LOGIC_CUBE=$HW_ENABLED_DEFAULT]) # Checks for libraries. @@ -197,9 +212,13 @@ AC_ARG_ENABLE(zeroplus-logic-cube, # libsigrok.pc file. SR_PKGLIBS="" +# libm (the standard math library) is always needed. +AC_SEARCH_LIBS([pow], [m]) + # 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). -AM_PATH_GLIB_2_0([2.28.0], +# 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"]) # libzip is always needed. Abort if it's not found. @@ -209,7 +228,7 @@ PKG_CHECK_MODULES([libzip], [libzip >= 0.8], # libusb-1.0 is only needed for some hardware drivers. Disable the respective # drivers if it is not found. -case "$build" in +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, @@ -222,10 +241,11 @@ case "$build" in [have_libusb1_0="yes"; CFLAGS="$CFLAGS $libusb_CFLAGS"; LIBS="$LIBS $libusb_LIBS"; SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"], - [have_libusb1_0="no"; LA_FX2LAFW="no"; HW_HANTEK_DSO="no"; - HW_LASCAR_EL_USB="no"; HW_NEXUS_OSCIPRIME="no"; + [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"; - LA_ZEROPLUS_LOGIC_CUBE="no"]) + HW_ZEROPLUS_LOGIC_CUBE="no"]) # Define HAVE_LIBUSB_1_0 in config.h if we found libusb-1.0. if test "x$have_libusb1_0" != "xno"; then @@ -243,13 +263,13 @@ PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16], [CFLAGS="$CFLAGS $libftdi_CFLAGS"; LIBS="$LIBS $libftdi_LIBS"; SR_PKGLIBS="$SR_PKGLIBS libftdi"], - [LA_ASIX_SIGMA="no"; LA_CHRONOVU_LA8="no"]) + [HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA8="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"], - [LA_LINK_MSO19="no"]) + [HW_LINK_MSO19="no"]) # ALSA is only needed for some hardware drivers. Disable them if not found. PKG_CHECK_MODULES([alsa], [alsa >= 1.0], @@ -266,7 +286,7 @@ AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes") # The Rigol DS1xx2 driver currently uses the Linux kernel usbtmc module # (though it is planned to rewrite the driver to be portable later). # Thus, it will be disabled for non-Linux builds for now. -case "$build" in +case "$host" in *linux*) # Do nothing. Whether the driver is enabled is determined by the # previous --enable-all-drivers/--disable-all-drivers and/or any @@ -292,9 +312,9 @@ if test "x$HW_ALSA" = "xyes"; then AC_DEFINE(HAVE_HW_ALSA, 1, [ALSA driver support]) fi -AM_CONDITIONAL(LA_ASIX_SIGMA, test x$LA_ASIX_SIGMA = xyes) -if test "x$LA_ASIX_SIGMA" = "xyes"; then - AC_DEFINE(HAVE_LA_ASIX_SIGMA, 1, [ASIX SIGMA/SIGMA2 support]) +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, [ASIX SIGMA/SIGMA2 support]) fi AM_CONDITIONAL(HW_BRYMEN_DMM, test x$HW_BRYMEN_DMM = xyes) @@ -302,9 +322,14 @@ if test "x$HW_BRYMEN_DMM" = "xyes"; then AC_DEFINE(HAVE_HW_BRYMEN_DMM, 1, [Brymen DMM support]) fi -AM_CONDITIONAL(LA_CHRONOVU_LA8, test x$LA_CHRONOVU_LA8 = xyes) -if test "x$LA_CHRONOVU_LA8" = "xyes"; then - AC_DEFINE(HAVE_LA_CHRONOVU_LA8, 1, [ChronoVu LA8 support]) +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, [CEM DT-885x support]) +fi + +AM_CONDITIONAL(HW_CHRONOVU_LA8, test x$HW_CHRONOVU_LA8 = xyes) +if test "x$HW_CHRONOVU_LA8" = "xyes"; then + AC_DEFINE(HAVE_HW_CHRONOVU_LA8, 1, [ChronoVu LA8 support]) fi AM_CONDITIONAL(HW_COLEAD_SLM, test x$HW_COLEAD_SLM = xyes) @@ -312,9 +337,9 @@ if test "x$HW_COLEAD_SLM" = "xyes"; then AC_DEFINE(HAVE_HW_COLEAD_SLM, 1, [Colead SLM support]) fi -AM_CONDITIONAL(LA_DEMO, test x$LA_DEMO = xyes) -if test "x$LA_DEMO" = "xyes"; then - AC_DEFINE(HAVE_LA_DEMO, 1, [Demo driver support]) +AM_CONDITIONAL(HW_DEMO, test x$HW_DEMO = xyes) +if test "x$HW_DEMO" = "xyes"; then + AC_DEFINE(HAVE_HW_DEMO, 1, [Demo driver support]) fi AM_CONDITIONAL(HW_FLUKE_DMM, test x$HW_FLUKE_DMM = xyes) @@ -322,9 +347,9 @@ if test "x$HW_FLUKE_DMM" = "xyes"; then AC_DEFINE(HAVE_HW_FLUKE_DMM, 1, [Fluke DMM support]) fi -AM_CONDITIONAL(LA_FX2LAFW, test x$LA_FX2LAFW = xyes) -if test "x$LA_FX2LAFW" = "xyes"; then - AC_DEFINE(HAVE_LA_FX2LAFW, 1, [fx2lafw support]) +AM_CONDITIONAL(HW_FX2LAFW, test x$HW_FX2LAFW = xyes) +if test "x$HW_FX2LAFW" = "xyes"; then + AC_DEFINE(HAVE_HW_FX2LAFW, 1, [fx2lafw support]) fi AM_CONDITIONAL(HW_HANTEK_DSO, test x$HW_HANTEK_DSO = xyes) @@ -332,14 +357,29 @@ if test "x$HW_HANTEK_DSO" = "xyes"; then AC_DEFINE(HAVE_HW_HANTEK_DSO, 1, [Hantek DSO support]) 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, [IKALOGIC Scanalogic-2 support]) +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, [IKALOGIC ScanaPLUS support]) +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, [Kecheng KC-330B support]) +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, [Lascar EL-USB support]) fi -AM_CONDITIONAL(LA_LINK_MSO19, test x$LA_LINK_MSO19 = xyes) -if test "x$LA_LINK_MSO19" = "xyes"; then - AC_DEFINE(HAVE_LA_LINK_MSO19, 1, [Link Instruments MSO-19 support]) +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) @@ -347,14 +387,9 @@ if test "x$HW_MIC_985XX" = "xyes"; then AC_DEFINE(HAVE_HW_MIC_985XX, 1, [MIC 985xx support]) fi -AM_CONDITIONAL(HW_NEXUS_OSCIPRIME, test x$HW_NEXUS_OSCIPRIME = xyes) -if test "x$HW_NEXUS_OSCIPRIME" = "xyes"; then - AC_DEFINE(HAVE_HW_NEXUS_OSCIPRIME, 1, [Nexus Osciprime support]) -fi - -AM_CONDITIONAL(LA_OLS, test x$LA_OLS = xyes) -if test "x$LA_OLS" = "xyes"; then - AC_DEFINE(HAVE_LA_OLS, 1, [OpenBench Logic Sniffer (OLS) support]) +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]) fi AM_CONDITIONAL(HW_RIGOL_DS1XX2, test x$HW_RIGOL_DS1XX2 = xyes) @@ -382,9 +417,9 @@ if test "x$HW_VICTOR_DMM" = "xyes"; then AC_DEFINE(HAVE_HW_VICTOR_DMM, 1, [Victor DMM support]) fi -AM_CONDITIONAL(LA_ZEROPLUS_LOGIC_CUBE, test x$LA_ZEROPLUS_LOGIC_CUBE = xyes) -if test "x$LA_ZEROPLUS_LOGIC_CUBE" = "xyes"; then - AC_DEFINE(HAVE_LA_ZEROPLUS_LOGIC_CUBE, 1, [ZEROPLUS Logic Cube support]) +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, [ZEROPLUS Logic Cube support]) fi # Checks for header files. @@ -425,12 +460,15 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile hardware/alsa/Makefile hardware/asix-sigma/Makefile hardware/brymen-dmm/Makefile + hardware/cem-dt-885x/Makefile hardware/chronovu-la8/Makefile hardware/colead-slm/Makefile hardware/common/Makefile + hardware/ikalogic-scanalogic2/Makefile + hardware/ikalogic-scanaplus/Makefile + hardware/kecheng-kc-330b/Makefile hardware/lascar-el-usb/Makefile hardware/mic-985xx/Makefile - hardware/nexus-osciprime/Makefile hardware/rigol-ds1xx2/Makefile hardware/tondaj-sl-814/Makefile hardware/victor-dmm/Makefile @@ -460,12 +498,14 @@ echo echo " - Package version (major.minor.micro): $SR_PACKAGE_VERSION" echo " - Library version (current:revision:age): $SR_LIB_VERSION" echo " - Prefix: $prefix" +echo " - Building on: $build" +echo " - Building for: $host" echo echo "Detected libraries:" echo # Note: This only works for libs with pkg-config integration. -for lib in "glib-2.0" "libzip" "libusb-1.0" "libftdi" "libudev" "alsa" "check"; do +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 if `$PKG_CONFIG --exists $lib`; then ver=`$PKG_CONFIG --modversion $lib` answer="yes ($ver)" @@ -478,24 +518,27 @@ done echo -e "\nEnabled hardware drivers:\n" echo " - agilent-dmm..................... $HW_AGILENT_DMM" echo " - alsa............................ $HW_ALSA" -echo " - asix-sigma...................... $LA_ASIX_SIGMA" +echo " - asix-sigma...................... $HW_ASIX_SIGMA" echo " - brymen-dmm...................... $HW_BRYMEN_DMM" -echo " - chronovu-la8.................... $LA_CHRONOVU_LA8" +echo " - cem-dt-885x..................... $HW_CEM_DT_885X" +echo " - chronovu-la8.................... $HW_CHRONOVU_LA8" echo " - colead-slm...................... $HW_COLEAD_SLM" -echo " - demo............................ $LA_DEMO" +echo " - demo............................ $HW_DEMO" echo " - fluke-dmm....................... $HW_FLUKE_DMM" -echo " - fx2lafw......................... $LA_FX2LAFW" +echo " - fx2lafw......................... $HW_FX2LAFW" echo " - hantek-dso...................... $HW_HANTEK_DSO" +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...................... $LA_LINK_MSO19" +echo " - link-mso19 (EXPERIMENTAL)....... $HW_LINK_MSO19" echo " - mic-985xx....................... $HW_MIC_985XX" -echo " - nexus-osciprime................. $HW_NEXUS_OSCIPRIME" -echo " - openbench-logic-sniffer......... $LA_OLS" +echo " - openbench-logic-sniffer......... $HW_OLS" echo " - rigol-ds1xx2.................... $HW_RIGOL_DS1XX2" echo " - serial-dmm...................... $HW_SERIAL_DMM" echo " - tondaj-sl-814................... $HW_TONDAJ_SL_814" echo " - uni-t-dmm....................... $HW_UNI_T_DMM" echo " - victor-dmm...................... $HW_VICTOR_DMM" -echo " - zeroplus-logic-cube............. $LA_ZEROPLUS_LOGIC_CUBE" +echo " - zeroplus-logic-cube............. $HW_ZEROPLUS_LOGIC_CUBE" echo