X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=a26b85161593f01e3f52836ebe31e127d802985c;hb=refs%2Fheads%2Fmaster;hp=fa40460e7d7eb95470dc28ac2faf2fb42f4d3eb9;hpb=f6e32b2dfa322aa4bd4a279a46d588e0e73ea238;p=libserialport.git

diff --git a/configure.ac b/configure.ac
index fa40460..a26b851 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,7 +88,7 @@ AC_DEFINE_UNQUOTED([SP_LIB_VERSION_AGE], [$SP_LIB_VERSION_AGE], [.])
 AC_DEFINE_UNQUOTED([SP_LIB_VERSION_STRING], ["$SP_LIB_VERSION"], [.])
 
 AM_CONDITIONAL([LINUX], [test -z "${host_os##linux*}" || test -z "${host_os##uclinux*}"])
-AM_CONDITIONAL([WIN32], [test -z "${host_os##mingw*}" || test -z "${host_os##cygwin*}"])
+AM_CONDITIONAL([WIN32], [test -z "${host_os##mingw*}"])
 AM_CONDITIONAL([MACOSX], [test -z "${host_os##darwin*}"])
 AM_CONDITIONAL([FREEBSD], [test -z "${host_os##freebsd*}"])
 
@@ -101,7 +101,7 @@ AC_SUBST([SP_PKGLIBS])
 AM_COND_IF([MACOSX], [AC_CHECK_HEADER([IOKit/IOKitLib.h], [],
 	[AC_MSG_ERROR([IOKit/IOKitLib.h not found])])])
 
-AS_CASE([$host_os], [linux*|darwin*|mingw*|cygwin*|freebsd*],, [
+AS_CASE([$host_os], [linux*|darwin*|mingw*|freebsd*],, [
 	AC_DEFINE([NO_ENUMERATION], [1], [Enumeration is unsupported.])
 	AC_DEFINE([NO_PORT_METADATA], [1], [Port metadata is unavailable.])
 ])
@@ -112,7 +112,7 @@ AC_SYS_LARGEFILE
 AC_TYPE_SIZE_T
 
 # Check for specific termios structures.
-AC_CHECK_TYPES([struct termios2, struct termiox],,,
+AC_CHECK_TYPES([struct termios2],,,
 	[[#include <linux/termios.h>]])
 AC_CHECK_MEMBERS([struct termios.c_ispeed, struct termios.c_ospeed,
 		struct termios2.c_ispeed, struct termios2.c_ospeed],,,
@@ -129,6 +129,10 @@ AC_CHECK_TYPES([struct serial_struct],,, [[#include <linux/serial.h>]])
 # Check for realpath().
 AC_CHECK_FUNC([realpath], [AC_DEFINE(HAVE_REALPATH, 1, [realpath is available.])], [])
 
+# Check for flock().
+AC_CHECK_HEADER([sys/file.h], [AC_DEFINE(HAVE_SYS_FILE_H, 1, [sys/file.h is available.])], [])
+AC_CHECK_FUNC([flock], [AC_DEFINE(HAVE_FLOCK, 1, [flock is available.])], [])
+
 # Check for clock_gettime().
 AC_CHECK_FUNC([clock_gettime],
 	[AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [clock_gettime is available.])], [])