X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=d072376515ff80b450ae615af8781386f75dd74a;hb=a93fb468885de8775f1d200625dac114d3050b1d;hp=b1e98b478be78343abbe56526a38d27bab533589;hpb=397d89de3acc260d6246a3bfa3b59cee53aafe31;p=libserialport.git

diff --git a/configure.ac b/configure.ac
index b1e98b4..d072376 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,14 +35,10 @@ AC_CONFIG_AUX_DIR([autostuff])
 AC_CANONICAL_TARGET
 
 # We require at least automake 1.11 (needed for 'silent rules').
-AM_INIT_AUTOMAKE([1.11 -Wall -Werror])
+AM_INIT_AUTOMAKE([1.11 -Wall -Werror check-news])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
-AH_TOP([#ifndef SP_CONFIG_H
-#define SP_CONFIG_H    /* To stop multiple inclusions. */])
-AH_BOTTOM([#endif /* SP_CONFIG_H */])
-
 # Enable more compiler warnings via -Wall and -Wextra.
 CFLAGS="$CFLAGS -Wall -Wextra"
 
@@ -52,9 +48,6 @@ 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
 
@@ -83,41 +76,38 @@ AC_SUBST(SP_LIB_LDFLAGS)
 # It is then used to construct the "Requires.private:" field in the
 # libserialport.pc file.
 SP_PKGLIBS=""
+SP_LIBS=""
 
 case $target_os in
 *linux*)
-	# On Linux libudev is currently required for enumeration.
-	AC_ARG_WITH([libudev],
-            [AS_HELP_STRING([--with-libudev],
-            [use libudev for serial port enumeration @<:@default=check@:>@])],
-            [], [with_libudev=check])
-	AS_IF([test "x$with_libudev" != xno], [
-	PKG_CHECK_MODULES([libudev], [libudev >= 0],
-		[CFLAGS="$CFLAGS $libudev_CFLAGS"; LIBS="$LIBS $libudev_LIBS";
-		SP_PKGLIBS="$SP_PKGLIBS libudev"; AC_DEFINE(HAVE_LIBUDEV)])], [])
+	AM_CONDITIONAL([LINUX], true)
 	;;
 *darwin*)
+	AM_CONDITIONAL([LINUX], false)
 	LDFLAGS="$LDFLAGS -Wl,-framework -Wl,IOKit -Wl,-framework -Wl,CoreFoundation"
 	AC_CHECK_HEADER(IOKit/IOKitLib.h, [], [AC_MSG_ERROR([IOKit/IOKitLib.h not found])])
 	;;
+mingw* | cygwin*)
+	AM_CONDITIONAL([LINUX], false)
+	SP_LIBS="-lsetupapi -luuid"
+	;;
+*)
+	AM_CONDITIONAL([LINUX], false)
 esac
 
 AC_SUBST(SP_PKGLIBS)
+AC_SUBST(SP_LIBS)
 
-# Checks for header files.
-# These are already checked: inttypes.h dlfcn.h memory.h stdint.h stdlib.h
-# string.h strings.h sys/types.h sys/stat.h unistd.h
-AC_CHECK_HEADERS([errno.h fcntl.h stddef.h sys/ioctl.h termios.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_INLINE
+# Define size_t if not defined as standard.
 AC_TYPE_SIZE_T
-AC_TYPE_SSIZE_T
-AC_CHECK_TYPE([struct termios2],[AC_DEFINE(HAVE_TERMIOS2, 1)],[],[[#include <linux/termios.h>]])
-AC_CHECK_TYPE([struct termiox],[AC_DEFINE(HAVE_TERMIOX, 1)],[],[[#include <linux/termios.h>]])
 
-# Checks for library functions.
-AC_CHECK_FUNCS([strerror])
+# Check for specific termios structures.
+AC_CHECK_TYPE([struct termios2], [AC_DEFINE(HAVE_TERMIOS2, 1)], [], [[#include <linux/termios.h>]])
+AC_CHECK_TYPE([struct termiox], [AC_DEFINE(HAVE_TERMIOX, 1)], [], [[#include <linux/termios.h>]])
+AC_CHECK_MEMBERS([struct termios.c_ispeed, struct termios.c_ospeed],
+	[AC_DEFINE(HAVE_TERMIOS_SPEED, 1)], [], [[#include <linux/termios.h>]])
+AC_CHECK_MEMBERS([struct termios2.c_ispeed, struct termios2.c_ospeed],
+	[AC_DEFINE(HAVE_TERMIOS2_SPEED, 1)], [], [[#include <linux/termios.h>]])
 
 AC_SUBST(MAKEFLAGS, '--no-print-directory')
 AC_SUBST(AM_LIBTOOLFLAGS, '--silent')