Simplify Mac OS implementation of sp_list_ports().

[libserialport.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 61ec6da987be134c044f0f9278496676783f820e..70dd1063f9783c8c1848d0bd96a1d99a639b6348 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ 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])
 
@@ -79,6 +79,7 @@ SP_PKGLIBS=""
 
 case $target_os in
 *linux*)
+       AM_CONDITIONAL([LINUX], true)
        # On Linux libudev is currently required for enumeration.
        AC_ARG_WITH([libudev],
             [AS_HELP_STRING([--with-libudev],
@@ -90,19 +91,26 @@ case $target_os in
                SP_PKGLIBS="$SP_PKGLIBS libudev"; AC_DEFINE(HAVE_LIBUDEV)])], [])
        ;;
 *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])])
        ;;
+*)
+       AM_CONDITIONAL([LINUX], false)
 esac
 
 AC_SUBST(SP_PKGLIBS)
 
-# Define size_t if not defined as as standard.
+# Define size_t if not defined as standard.
 AC_TYPE_SIZE_T
 
 # 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_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')