X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=3ad9bed42a1f946d8aa17fe9e6328f1eeeec13af;hb=98cac5d63e047a633ac1078950840688c1d5234f;hp=551ef709496612bc29504a98002a3cbef620ce9f;hpb=40978c2b4182d09b197a0218cc107e49509747ad;p=libserialport.git

diff --git a/configure.ac b/configure.ac
index 551ef70..3ad9bed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,8 @@ AC_PREREQ([2.63])
 # libserialport package version number (NOT the same as shared lib version!).
 m4_define([sp_package_version_major], [0])
 m4_define([sp_package_version_minor], [1])
-m4_define([sp_package_version], [sp_package_version_major.sp_package_version_minor])
+m4_define([sp_package_version_micro], [0])
+m4_define([sp_package_version], [sp_package_version_major.sp_package_version_minor.sp_package_version_micro])
 
 AC_INIT([libserialport], [sp_package_version], [martin-libserialport@earth.li],
 	[libserialport], [http://sigrok.org/wiki/Libserialport])
@@ -34,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"
 
@@ -51,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
 
@@ -85,43 +79,41 @@ SP_PKGLIBS=""
 
 case $target_os in
 *linux*)
-	# On Linux libudev is currently a hard requirement.
-	PKG_CHECK_MODULES([libudev], [libudev >= 0],
-		[CFLAGS="$CFLAGS $libudev_CFLAGS"; LIBS="$LIBS $libudev_LIBS";
-		SP_PKGLIBS="$SP_PKGLIBS 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])])
 	;;
+*)
+	AM_CONDITIONAL([LINUX], false)
 esac
 
 AC_SUBST(SP_PKGLIBS)
 
-# 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')
 
 SP_PACKAGE_VERSION_MAJOR=sp_package_version_major
 SP_PACKAGE_VERSION_MINOR=sp_package_version_minor
+SP_PACKAGE_VERSION_MICRO=sp_package_version_micro
 SP_PACKAGE_VERSION=sp_package_version
 
 AC_SUBST(SP_PACKAGE_VERSION_MAJOR)
 AC_SUBST(SP_PACKAGE_VERSION_MINOR)
+AC_SUBST(SP_PACKAGE_VERSION_MICRO)
 AC_SUBST(SP_PACKAGE_VERSION)
 
 AC_CONFIG_FILES([Makefile libserialport.h libserialport.pc])
@@ -131,7 +123,7 @@ AC_OUTPUT
 echo
 echo "libserialport configuration summary:"
 echo
-echo "  - Package version (major.minor):          $SP_PACKAGE_VERSION"
+echo "  - Package version (major.minor.micro):    $SP_PACKAGE_VERSION"
 echo "  - Library version (current:revision:age): $SP_LIB_VERSION"
 echo "  - Prefix: $prefix"
 echo "  - Building on: $build"