X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=0380534ae3282462d4e76c0e8df35553a4d336b5;hb=896fc9c7231c7567cda84404eb0fcdd889b556a2;hp=b4a4332eae15f01932c649a693a790af3f3f490b;hpb=bbb3996c06f2b1ebc9529d1e2181ddc55f70d9da;p=libsigrok.git diff --git a/configure.ac b/configure.ac index b4a4332e..0380534a 100644 --- a/configure.ac +++ b/configure.ac @@ -33,9 +33,7 @@ AM_INIT_AUTOMAKE([1.11 -Wall -Werror no-define nostdinc subdir-objects check-new AM_SILENT_RULES([yes]) m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) -AH_TOP([#ifndef SR_CONFIG_H -#define SR_CONFIG_H /* To stop multiple inclusions. */]) -AH_BOTTOM([#endif /* SR_CONFIG_H */]) +AC_CANONICAL_HOST # Checks for programs. AC_PROG_CC @@ -46,6 +44,19 @@ AC_PROG_LN_S # Required for per-target flags or subdir-objects with C sources. AM_PROG_CC_C_O +# Set the standard the C library headers should conform to. +AH_VERBATIM([_POSIX_C_SOURCE], [/* The targeted POSIX standard. */ +#ifndef _POSIX_C_SOURCE +# define _POSIX_C_SOURCE 200112L +#endif]) + +# Get compiler versions. +SR_PROG_VERSION([$CC], [sr_cc_version]) +SR_PROG_VERSION([$CXX], [sr_cxx_version]) + +# Check for optional make features. +SR_PROG_MAKE_ORDER_ONLY + # Initialize libtool. LT_INIT @@ -58,10 +69,14 @@ SR_PKG_VERSION_SET([SR_PACKAGE_VERSION], [AC_PACKAGE_VERSION]) # http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info SR_LIB_VERSION_SET([SR_LIB_VERSION], [2:0:0]) +AM_CONDITIONAL([WIN32], [test -z "${host_os##mingw*}" || test -z "${host_os##cygwin*}"]) + ############################# ## Optional dependencies ## ############################# +AC_LANG([C]) + # Initialize pkg-config. # We require at least 0.22, as "Requires.private" behaviour changed there. PKG_PROG_PKG_CONFIG([0.22]) @@ -76,6 +91,7 @@ SR_VAR_OPT_PKG([SR_PKGLIBS], [sr_deps_avail]) SR_PKGLIBS_TESTS= SR_PKGLIBS_CXX= SR_PKGLIBS_PYTHON= +SR_EXTRA_LIBS= SR_ARG_OPT_PKG([libserialport], [LIBSERIALPORT], [NEED_SERIAL], [libserialport >= 0.1.1]) @@ -85,10 +101,15 @@ SR_ARG_OPT_PKG([libftdi], [LIBFTDI],, # 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. -AS_CASE([$host], [*freebsd*], [sr_have_libusb=yes]) +# On Windows, require the latest version we can get our hands on, +# until the new generic event handling has seen an official release. +AS_CASE([$host_os], + [freebsd*], [sr_libusb_req='libusb-1.0' sr_have_libusb=yes], + [mingw*], [sr_libusb_req='libusb-1.0 >= 1.0.20'], + [sr_libusb_req='libusb-1.0 >= 1.0.16']) SR_ARG_OPT_PKG([libusb], [LIBUSB_1_0], [NEED_USB], - [libusb-1.0 >= 1.0.16]) + [$sr_libusb_req]) SR_ARG_OPT_PKG([librevisa], [LIBREVISA], [NEED_VISA], [librevisa >= 0.0.20130412]) @@ -96,6 +117,17 @@ SR_ARG_OPT_PKG([librevisa], [LIBREVISA], [NEED_VISA], SR_ARG_OPT_PKG([libgpib], [LIBGPIB], [NEED_GPIB], [libgpib]) +SR_ARG_OPT_CHECK([libieee1284], [LIBIEEE1284],, [ + sr_save_LIBS=$LIBS + LIBS="-lieee1284 $LIBS" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], + [[(void) ieee1284_open(0, 0, 0);]])], + [sr_have_libieee1284=yes], [sr_have_libieee1284=no]) + LIBS=$sr_save_LIBS +]) +AS_IF([test "x$sr_have_libieee1284" = xyes], + [SR_PREPEND([SR_EXTRA_LIBS], [-lieee1284])]) + ###################### ## Feature checks ## ###################### @@ -104,8 +136,6 @@ SR_ARG_OPT_PKG([libgpib], [LIBGPIB], [NEED_GPIB], SR_PKG_CHECK([check], [SR_PKGLIBS_TESTS], [check >= 0.9.4]) AM_CONDITIONAL([HAVE_CHECK], [test "x$sr_have_check" = xyes]) -AC_LANG([C]) - # Enable the C99 standard if possible, and enforce the use # of SR_API to explicitly mark all public API functions. SR_EXTRA_CFLAGS= @@ -123,7 +153,7 @@ AC_CHECK_HEADERS([sys/ioctl.h], [SR_APPEND([sr_deps_avail], [sys_ioctl_h])]) AC_CHECK_HEADERS([sys/timerfd.h], [SR_APPEND([sr_deps_avail], [sys_timerfd_h])]) # We need to link against the Winsock2 library for SCPI over TCP. -AS_CASE([$host], [*-mingw*], [SR_EXTRA_LIBS='-lws2_32'], [SR_EXTRA_LIBS=]) +AS_CASE([$host_os], [mingw*], [SR_PREPEND([SR_EXTRA_LIBS], [-lws2_32])]) # libm (the standard math library) is always needed. SR_SEARCH_LIBS([SR_EXTRA_LIBS], [pow], [m]) @@ -201,12 +231,15 @@ SR_DRIVER([demo], [demo]) SR_DRIVER([Fluke DMM], [fluke-dmm], [libserialport]) SR_DRIVER([fx2lafw], [fx2lafw], [libusb]) SR_DRIVER([GMC MH 1x/2x], [gmc-mh-1x-2x], [libserialport]) +SR_DRIVER([GW Instek GDS-800], [gwinstek-gds-800], [libserialport]) SR_DRIVER([Hameg HMO], [hameg-hmo], [libserialport]) SR_DRIVER([Hantek DSO], [hantek-dso], [libusb]) +SR_DRIVER([Hung-Chang DSO-2100], [hung-chang-dso-2100], [libieee1284]) SR_DRIVER([Ikalogic Scanalogic-2], [ikalogic-scanalogic2], [libusb]) SR_DRIVER([Ikalogic Scanaplus], [ikalogic-scanaplus], [libftdi]) SR_DRIVER([Kecheng KC-330B], [kecheng-kc-330b], [libusb]) SR_DRIVER([KERN scale], [kern-scale], [libserialport]) +SR_DRIVER([Korad KDxxxxP], [korad-kdxxxxp], [libserialport]) SR_DRIVER([Lascar EL-USB], [lascar-el-usb], [libusb]) SR_DRIVER([Manson HCS-3xxx], [manson-hcs-3xxx], [libserialport]) SR_DRIVER([maynuo-m97], [maynuo-m97]) @@ -317,15 +350,22 @@ PKG_CHECK_EXISTS([pygobject-3.0 < 3.7.91], [AC_DEFINE([PYGOBJECT_FLAGS_SIGNED], [1], [Whether last argument to pyg_flags_get_value() is signed.])]) -# The Python bindings need the setuptools Python module. -# We'll let it go through even if the AX macro wasn't found, -# as the Python module may still be there. -HAVE_PYMOD_SETUPTOOLS=yes -m4_ifdef([AX_PYTHON_MODULE], - [AX_PYTHON_MODULE([setuptools])], - [m4_warn([unsupported], [Missing macro AX_PYTHON_MODULE: no setuptools check])]) +# The Python bindings need the setuptools and numpy Python modules. +# We'll let it go through even if the AX macro wasn't found, as the +# Python modules may still be there. +m4_ifdef([AX_PYTHON_MODULE], [ + AX_PYTHON_MODULE([setuptools]) + AX_PYTHON_MODULE([numpy]) +], [ + HAVE_PYMOD_SETUPTOOLS=yes + HAVE_PYMOD_NUMPY=yes + m4_warn([unsupported], + [Missing macro AX_PYTHON_MODULE: no check for setuptools and numpy]) +]) AS_IF([test "x$HAVE_PYMOD_SETUPTOOLS" != xyes], [SR_APPEND([sr_python_missing], [', '], [setuptools])]) +AS_IF([test "x$HAVE_PYMOD_NUMPY" != xyes], + [SR_APPEND([sr_python_missing], [', '], [numpy])]) # The Python bindings use SWIG to generate code. AC_CHECK_PROGS([SWIG], [swig swig3.0 swig2.0]) @@ -391,7 +431,7 @@ AM_CONDITIONAL([BINDINGS_JAVA], [test "x$BINDINGS_JAVA" = xyes]) ############################## # Add mandatory dependencies to module list. -SR_APPEND([SR_PKGLIBS], ['libzip >= 0.10']) +SR_APPEND([SR_PKGLIBS], ['libzip >= 0.11']) AC_SUBST([SR_PKGLIBS]) # Retrieve the compile and link flags for all modules combined. @@ -405,6 +445,18 @@ AM_COND_IF([BINDINGS_CXX], [ PKG_CHECK_MODULES([LIBSIGROKCXX], [$SR_PKGLIBS_CXX]) PKG_CHECK_MODULES([PYSIGROK], [$SR_PKGLIBS_PYTHON $SR_PKGLIBS_CXX]) ]) + +# Check for specific libusb features, now that we know the CFLAGS. +AC_LANG([C]) +sr_save_cflags=$CFLAGS +CFLAGS="$LIBSIGROK_CFLAGS $CFLAGS" +AC_CHECK_TYPES([libusb_os_handle], + [sr_have_libusb_os_handle=yes], [sr_have_libusb_os_handle=no], + [[#include ]]) +CFLAGS=$sr_save_cflags +AM_COND_IF([NEED_USB], [AS_CASE([$sr_have_libusb_os_handle:$host_os], [no:mingw*], + [AC_MSG_ERROR([Windows builds require the event-abstraction branch of libusb])])]) + sr_glib_version=`$PKG_CONFIG --modversion glib-2.0 2>&AS_MESSAGE_LOG_FD` sr_libzip_version=`$PKG_CONFIG --modversion libzip 2>&AS_MESSAGE_LOG_FD` @@ -433,13 +485,21 @@ libsigrok configuration summary: - Prefix.......................... $prefix - Building on..................... $build - Building for.................... $host + +Compile configuration: + - C compiler...................... $CC + - C compiler version.............. $sr_cc_version + - C compiler flags................ $CFLAGS - Additional C compiler flags..... $SR_EXTRA_CFLAGS - C compiler warnings............. $SR_WFLAGS + - C++ compiler.................... $CXX + - C++ compiler version............ $sr_cxx_version + - C++ compiler flags.............. $CXXFLAGS - C++ compiler warnings........... $SR_WXXFLAGS Detected libraries (required): - glib-2.0 >= 2.32.0.............. $sr_glib_version - - libzip >= 0.10.................. $sr_libzip_version + - libzip >= 0.11.................. $sr_libzip_version Detected libraries (optional): $sr_pkglibs_summary