X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=configure.ac;h=aa93d7aad6a1afb8563be769dda37c2b2d3ab2d8;hp=aff5f4cda3aaa25d92fb565ae6158df3ea232c68;hb=9d1164f9a12c218def0e898e4d28fcd55f2fa8cd;hpb=ae4c3d0431571346f489be3a370a9bb431a6ec59 diff --git a/configure.ac b/configure.ac index aff5f4cd..aa93d7aa 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 @@ -139,21 +139,11 @@ AC_ARG_ENABLE(lascar-el-usb, AC_HELP_STRING([--enable-lascar-el-usb], [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]) - 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"], @@ -199,7 +189,8 @@ SR_PKGLIBS="" # 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 +200,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, @@ -228,13 +219,16 @@ case "$build" in LA_ZEROPLUS_LOGIC_CUBE="no"]) # Define HAVE_LIBUSB_1_0 in config.h if we found libusb-1.0. - if test "x$libusb_CFLAGS" != "x"; then + 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 +# 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], [CFLAGS="$CFLAGS $libftdi_CFLAGS"; @@ -242,12 +236,6 @@ PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16], SR_PKGLIBS="$SR_PKGLIBS libftdi"], [LA_ASIX_SIGMA="no"; LA_CHRONOVU_LA8="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"]) - # ALSA is only needed for some hardware drivers. Disable them if not found. PKG_CHECK_MODULES([alsa], [alsa >= 1.0], [CFLAGS="$CFLAGS $alsa_CFLAGS"; LIBS="$LIBS $alsa_LIBS"; @@ -260,22 +248,20 @@ PKG_CHECK_MODULES([check], [check >= 0.9.4], LIBS="$LIBS $check_LIBS"], [have_check="no"]) AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes") -# EZUSB FX2 firmware helper code is only needed for some hardware drivers. -AM_CONDITIONAL(NEED_EZUSB, \ - test "x$LA_FX2LAFW" != xno \ - -o "x$HW_HANTEK_DSO" != xno \ -) - -# Serial port helper code is only needed for some hardware drivers. -AM_CONDITIONAL(NEED_SERIAL, \ - test "x$HW_AGILENT_DMM" != xno \ - -o "x$HW_COLEAD_SLM" != xno \ - -o "x$HW_FLUKE_DMM" != xno \ - -o "x$LA_LINK_MSO19" != xno \ - -o "x$LA_OLS" != xno \ - -o "x$HW_SERIAL_DMM" != xno \ - -o "x$HW_TONDAJ_SL_814" != xno \ -) +# 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 "$host" in +*linux*) + # Do nothing. Whether the driver is enabled is determined by the + # previous --enable-all-drivers/--disable-all-drivers and/or any + # --enable-rigol-ds1xx2/--disable-rigol-ds1xx2 options. + ;; +*) + # Disable the driver for builds that don't target Linux. + HW_RIGOL_DS1XX2="no" + ;; +esac AC_SUBST(SR_PKGLIBS) @@ -298,7 +284,7 @@ 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, [brymen-dmm support]) + AC_DEFINE(HAVE_HW_BRYMEN_DMM, 1, [Brymen DMM support]) fi AM_CONDITIONAL(LA_CHRONOVU_LA8, test x$LA_CHRONOVU_LA8 = xyes) @@ -336,21 +322,11 @@ 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]) -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_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]) @@ -378,7 +354,7 @@ 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, [victor-dmm support]) + AC_DEFINE(HAVE_HW_VICTOR_DMM, 1, [Victor DMM support]) fi AM_CONDITIONAL(LA_ZEROPLUS_LOGIC_CUBE, test x$LA_ZEROPLUS_LOGIC_CUBE = xyes) @@ -429,7 +405,6 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile hardware/common/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 @@ -438,7 +413,6 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile hardware/fluke-dmm/Makefile hardware/fx2lafw/Makefile hardware/hantek-dso/Makefile - hardware/link-mso19/Makefile hardware/openbench-logic-sniffer/Makefile hardware/serial-dmm/Makefile hardware/uni-t-dmm/Makefile @@ -459,12 +433,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" "alsa >= 1.0" "check >= 0.9.4"; do if `$PKG_CONFIG --exists $lib`; then ver=`$PKG_CONFIG --modversion $lib` answer="yes ($ver)" @@ -475,26 +451,24 @@ for lib in "glib-2.0" "libzip" "libusb-1.0" "libftdi" "libudev" "alsa" "check"; done echo -e "\nEnabled hardware drivers:\n" -echo " - Agilent DMM..................... $HW_AGILENT_DMM" -echo " - ALSA............................ $HW_ALSA" -echo " - ASIX SIGMA/SIGMA2............... $LA_ASIX_SIGMA" -echo " - Brymen DMM...................... $HW_BRYMEN_DMM" -echo " - ChronoVu LA8.................... $LA_CHRONOVU_LA8" -echo " - Colead SLM...................... $HW_COLEAD_SLM" -echo " - Demo driver..................... $LA_DEMO" -echo " - Fluke DMM....................... $HW_FLUKE_DMM" -echo " - fx2lafw (for FX2 LAs)........... $LA_FX2LAFW" -echo " - Hantek DSO...................... $HW_HANTEK_DSO" -echo " - Lascar EL-USB................... $HW_LASCAR_EL_USB" -echo " - Link MSO-19..................... $LA_LINK_MSO19" -echo " - MIC 985xx....................... $HW_MIC_985XX" -echo " - Nexus Osciprime................. $HW_NEXUS_OSCIPRIME" -echo " - Openbench Logic Sniffer......... $LA_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 " - agilent-dmm..................... $HW_AGILENT_DMM" +echo " - alsa............................ $HW_ALSA" +echo " - asix-sigma...................... $LA_ASIX_SIGMA" +echo " - brymen-dmm...................... $HW_BRYMEN_DMM" +echo " - chronovu-la8.................... $LA_CHRONOVU_LA8" +echo " - colead-slm...................... $HW_COLEAD_SLM" +echo " - demo............................ $LA_DEMO" +echo " - fluke-dmm....................... $HW_FLUKE_DMM" +echo " - fx2lafw......................... $LA_FX2LAFW" +echo " - hantek-dso...................... $HW_HANTEK_DSO" +echo " - lascar-el-usb................... $HW_LASCAR_EL_USB" +echo " - mic-985xx....................... $HW_MIC_985XX" +echo " - openbench-logic-sniffer......... $LA_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