X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=a54b23a4913ec3716acc321585cb4cf5810563d4;hb=refs%2Fheads%2Fdslogic;hp=3023345e66ece2a1c1c68477868a389fa094a091;hpb=2f3a6df8e4f34c8902002de4dcc3fda94f195ae0;p=libsigrok.git diff --git a/configure.ac b/configure.ac index 3023345e..a54b23a4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,8 @@ ## -## 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 ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -22,18 +23,18 @@ 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], [1]) -m4_define([sr_package_version_micro], [1]) +m4_define([sr_package_version_minor], [2]) +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], - [libsigrok], [http://www.sigrok.org]) +AC_INIT([libsigrok4DSLogic], [sr_package_version], [support@dreamsourcelab.com], + [libsigrok4DSLogic], [http://www.dreamsourcelab.com]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([autostuff]) AC_CONFIG_AUX_DIR([autostuff]) # We require at least automake 1.11 (needed for 'silent rules'). -AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign std-options]) +AM_INIT_AUTOMAKE([1.11 -Wall -Werror check-news color-tests]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) @@ -43,15 +44,17 @@ AH_BOTTOM([#endif /* SR_CONFIG_H */]) # Enable more compiler warnings via -Wall and -Wextra. Add -fvisibility=hidden # and enforce use of SR_API to explicitly mark all public API functions. -CFLAGS="-g -Wall -Wextra -fvisibility=hidden" +CFLAGS="$CFLAGS -Wall -Wextra -fvisibility=hidden" # Checks for programs. -AC_PROG_CXX AC_PROG_CC AC_PROG_CPP AC_PROG_INSTALL AC_PROG_LN_S +# Required for per-target flags or subdir-objects with C sources. +AM_PROG_CC_C_O + # Initialize libtool. LT_INIT @@ -63,8 +66,8 @@ 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=0 -SR_LIB_VERSION_REVISION=0 +SR_LIB_VERSION_CURRENT=1 +SR_LIB_VERSION_REVISION=2 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" @@ -74,157 +77,115 @@ AC_SUBST(SR_LIB_VERSION_AGE) AC_SUBST(SR_LIB_VERSION) AC_SUBST(SR_LIB_LDFLAGS) -# Logic analyzer hardware support '--enable' options. - -# Disabled by default, unfinished. -AC_ARG_ENABLE(alsa, AC_HELP_STRING([--enable-alsa], - [enable ALSA driver support [default=no]]), - [LA_ALSA="$enableval"], - [LA_ALSA=no]) -AM_CONDITIONAL(LA_ALSA, test x$LA_ALSA = xyes) -if test "x$LA_ALSA" = "xyes"; then - AC_DEFINE(HAVE_LA_ALSA, 1, [ALSA driver support]) -fi - -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=yes]) -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]) -fi - -AC_ARG_ENABLE(chronovu-la8, AC_HELP_STRING([--enable-chronovu-la8], - [enable ChronoVu LA8 support [default=yes]]), - [LA_CHRONOVU_LA8="$enableval"], - [LA_CHRONOVU_LA8=yes]) -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]) -fi - -# Disabled per default for now, will be enabled when it's tested some more. -AC_ARG_ENABLE(fx2lafw, AC_HELP_STRING([--enable-fx2lafw], - [enable fx2lafw support (for FX2 LAs). [default=no]]), - [LA_FX2LAFW="$enableval"], - [LA_FX2LAFW=yes]) -AM_CONDITIONAL(LA_FX2LAFW, test x$LA_FX2LAFW = xyes) -if test "x$LA_FX2LAFW" = "xyes"; then - AC_DEFINE(HAVE_LA_FX2LAFW, 1, [fx2lafw support]) -fi +AC_ARG_ENABLE(all-drivers, AC_HELP_STRING([--enable-all-drivers], + [enable all drivers by default [default=yes]]), + [HW_ENABLED_DEFAULT="$enableval"], + [HW_ENABLED_DEFAULT="yes"]) AC_ARG_ENABLE(demo, AC_HELP_STRING([--enable-demo], - [enable demo driver support [default=yes]]), - [LA_DEMO="$enableval"], - [LA_DEMO=yes]) -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]) -fi - -# Disabled by default, unfinished. -AC_ARG_ENABLE(link-mso19, AC_HELP_STRING([--enable-link-mso19], - [enable Link Instruments MSO-19 support [default=no]]), - [LA_LINK_MSO19="$enableval"], - [LA_LINK_MSO19=no]) -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 - -AC_ARG_ENABLE(ols, AC_HELP_STRING([--enable-ols], - [enable OpenBench Logic Sniffer (OLS) support [default=yes]]), - [LA_OLS="$enableval"], - [LA_OLS=yes]) -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]) -fi - -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=yes]) -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]) -fi - + [enable demo driver support [default=yes]]), + [HW_DEMO="$enableval"], + [HW_DEMO=$HW_ENABLED_DEFAULT]) # Checks for libraries. +case "$host" in +*mingw*) + # We need to link against the Winsock2 library for SCPI over TCP. + LIBS="$LIBS -lws2_32";; +esac + # This variable collects the pkg-config names of all detected libs. # It is then used to construct the "Requires.private:" field in the -# libsigrok.pc file. +# libsigrok4DSLogic.pc file. SR_PKGLIBS="" -# libglib-2.0 is always needed. +# 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.22.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"]) -# libgthread-2.0 is always needed (e.g. for the demo hardware driver). -PKG_CHECK_MODULES([gthread], [gthread-2.0 >= 2.22.0], - [CFLAGS="$CFLAGS $gthread_CFLAGS"; LIBS="$LIBS $gthread_LIBS"; - SR_PKGLIBS="$SR_PKGLIBS gthread-2.0"]) - -# libusb is only needed for some hardware drivers. -if test "x$LA_ASIX_SIGMA" != xno \ - -o "x$LA_CHRONOVU_LA8" != xno \ - -o "x$LA_ZEROPLUS_LOGIC_CUBE" != xno \ - -o "x$LA_FX2LAFW" != xno; then - case "$build" in - *freebsd*) - # FreeBSD comes with an "integrated" libusb-1.0-style USB API. - 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.5], - [CFLAGS="$CFLAGS $libusb_CFLAGS"; - LIBS="$LIBS $libusb_LIBS"; - SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"]) - AC_CHECK_LIB(usb-1.0, libusb_init) - ;; - esac -fi - -# libzip is always needed. -PKG_CHECK_MODULES([libzip], [libzip >= 0.8], +# libzip is always needed. Abort if it's not found. +PKG_CHECK_MODULES([libzip], [libzip >= 0.10], [CFLAGS="$CFLAGS $libzip_CFLAGS"; LIBS="$LIBS $libzip_LIBS"; SR_PKGLIBS="$SR_PKGLIBS libzip"]) -# libftdi is only needed for some hardware drivers. -if test "x$LA_ASIX_SIGMA" != xno \ - -o "x$LA_CHRONOVU_LA8" != xno; then - PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16], - [CFLAGS="$CFLAGS $libftdi_CFLAGS"; - LIBS="$LIBS $libftdi_LIBS"; - SR_PKGLIBS="$SR_PKGLIBS libftdi"]) +# 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"; CFLAGS="$CFLAGS $libserialport_CFLAGS"; + LIBS="$LIBS $libserialport_LIBS"; + SR_PKGLIBS="$SR_PKGLIBS libserialport"], + [have_libserialport="no"]) + +# Define HAVE_LIBSERIALPORT in config.h if we found libserialport. +if test "x$have_libserialport" != "xno"; then + AC_DEFINE_UNQUOTED(HAVE_LIBSERIALPORT, [1], + [Specifies whether we have libserialport.]) fi -# libudev is only needed for some hardware drivers. -if test "x$LA_LINK_MSO19" != xno; then - PKG_CHECK_MODULES([libudev], [libudev >= 151], - [CFLAGS="$CFLAGS $libudev_CFLAGS"; LIBS="$LIBS $libudev_LIBS"; - SR_PKGLIBS="$SR_PKGLIBS libudev"]) -fi +# Serial port helper code is only compiled in if libserialport was found. +AM_CONDITIONAL(NEED_SERIAL, test "x$have_libserialport" != xno) + +# 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. + 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.9], + [have_libusb1_0="yes"; CFLAGS="$CFLAGS $libusb_CFLAGS"; + LIBS="$LIBS $libusb_LIBS"; + SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"], + [have_libusb1_0="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 + + + +# The Check unit testing framework is optional. Disable if not found. +PKG_CHECK_MODULES([check], [check >= 0.9.4], + [have_check="yes"; CFLAGS="$CFLAGS $check_CFLAGS"; + LIBS="$LIBS $check_LIBS"], [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. -# ALSA is only needed for some hardware drivers. -if test "x$LA_ALSA" != xno; then - PKG_CHECK_MODULES([alsa], [alsa >= 1.0], - [CFLAGS="$CFLAGS $alsa_CFLAGS"; LIBS="$LIBS $alsa_LIBS"; - SR_PKGLIBS="$SR_PKGLIBS alsa"]) -fi AC_SUBST(SR_PKGLIBS) +# Now set AM_CONDITIONALs and AC_DEFINEs for the enabled/disabled drivers. + + + +AM_CONDITIONAL(HW_DEMO, test x$HW_DEMO = xyes) +if test "x$HW_DEMO" = "xyes"; then + AC_DEFINE(HAVE_LA_DEMO, 1, [Demo driver support]) +fi + + + # Checks for header files. # These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h. AC_CHECK_HEADERS([fcntl.h sys/time.h termios.h]) # Checks for typedefs, structures, and compiler characteristics. +AC_C_BIGENDIAN AC_C_INLINE AC_TYPE_INT8_T AC_TYPE_INT16_T @@ -253,23 +214,13 @@ AC_SUBST(SR_PACKAGE_VERSION_MINOR) AC_SUBST(SR_PACKAGE_VERSION_MICRO) AC_SUBST(SR_PACKAGE_VERSION) -AC_CONFIG_FILES([Makefile - sigrok.h - hardware/Makefile - hardware/alsa/Makefile - hardware/asix-sigma/Makefile - hardware/chronovu-la8/Makefile - hardware/common/Makefile +AC_CONFIG_FILES([Makefile version.h hardware/Makefile hardware/demo/Makefile - hardware/fx2lafw/Makefile - hardware/link-mso19/Makefile - hardware/openbench-logic-sniffer/Makefile - hardware/zeroplus-logic-cube/Makefile input/Makefile output/Makefile output/text/Makefile - libsigrok.pc - contrib/Makefile + libsigrok4DSLogic.pc + tests/Makefile ]) AC_OUTPUT @@ -280,12 +231,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" "gthread-2.0" "libusb-1.0" "libzip" "libftdi" "libudev" "alsa"; do +for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.0" "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)" @@ -295,15 +248,7 @@ for lib in "glib-2.0" "gthread-2.0" "libusb-1.0" "libzip" "libftdi" "libudev" "a echo " - $lib: $answer" done -echo -echo "Enabled hardware drivers:" -echo -echo " - ASIX SIGMA/SIGMA2............... $LA_ASIX_SIGMA" -echo " - ChronoVu LA8.................... $LA_CHRONOVU_LA8" -echo " - Demo driver..................... $LA_DEMO" -echo " - fx2lafw (for FX2 LAs)........... $LA_FX2LAFW" -echo " - Link MSO-19..................... $LA_LINK_MSO19" -echo " - Openbench Logic Sniffer......... $LA_OLS" -echo " - Zeroplus Logic Cube............. $LA_ZEROPLUS_LOGIC_CUBE" +echo -e "\nEnabled hardware drivers:\n" +echo " - demo............................ $HW_DEMO" echo