From: Uwe Hermann Date: Mon, 4 Aug 2014 20:00:17 +0000 (+0200) Subject: configure.ac: Don't build BeagleLogic where a build would fail. X-Git-Tag: libsigrok-0.4.0~1170 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=375340a7245cdbfe1c769108fee77d52c45c963a;p=libsigrok.git configure.ac: Don't build BeagleLogic where a build would fail. The BeagleLogic driver needs sys/mman.h and sys/ioctl.h in order to build, so disable the driver if those headers aren't available. This is the case (for example) on MinGW. --- diff --git a/configure.ac b/configure.ac index d2faf59a..68f9d1f6 100644 --- a/configure.ac +++ b/configure.ac @@ -409,6 +409,10 @@ case "$host" in ;; 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"]) + AC_SUBST(SR_PKGLIBS) CFLAGS="$CFLAGS -I./include/libsigrok $LIB_CFLAGS" @@ -633,7 +637,8 @@ AM_CONDITIONAL(BINDINGS_PYTHON, test x$BINDINGS_PYTHON = xyes) AM_CONDITIONAL(BINDINGS_JAVA, test x$BINDINGS_JAVA = xyes) # Checks for header files. -# These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h. +# These are already implicitly checked: inttypes.h stdint.h stdlib.h string.h +# unistd.h memory.h strings.h dlfcn.h sys/types.h sys/stat.h. # Checks for typedefs, structures, and compiler characteristics. AC_C_BIGENDIAN