X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=50f8de43fc9ba14458d0e8baa9e10d3e33ca014b;hb=863b35e69cbad5dce9f9f0547968730de8789256;hp=91174fc6a8fbde25ca686e33f0cf70b42fcf9f9d;hpb=728f6de510c1a52a52a0deccbdf3dc5a10e2500c;p=libserialport.git

diff --git a/configure.ac b/configure.ac
index 91174fc..50f8de4 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])
@@ -107,6 +108,8 @@ AC_CHECK_HEADERS([errno.h fcntl.h stddef.h sys/ioctl.h termios.h])
 AC_C_INLINE
 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])
@@ -116,10 +119,12 @@ 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])
@@ -129,7 +134,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"