X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=b1e98b478be78343abbe56526a38d27bab533589;hb=0a1ab8bf8f4c76c809c63ff26d0aa4a5af418728;hp=31e54bb8cfa308e0d406d5eba81f14b78df411c1;hpb=1ebf4347e087d10ea7f9bd916c8bdc426ffd4b5e;p=libserialport.git

diff --git a/configure.ac b/configure.ac
index 31e54bb..b1e98b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,10 +24,11 @@ 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://github.com/martinling/libserialport])
+	[libserialport], [http://sigrok.org/wiki/Libserialport])
 AC_CONFIG_MACRO_DIR([autostuff])
 AC_CONFIG_AUX_DIR([autostuff])
 
@@ -58,6 +59,7 @@ AM_PROG_CC_C_O
 LT_INIT
 
 # Initialize pkg-config.
+# We require at least 0.22, as "Requires.private" behaviour changed there.
 PKG_PROG_PKG_CONFIG([0.22])
 
 # Library version for libserialport (NOT the same as the package version).
@@ -75,15 +77,24 @@ AC_SUBST(SP_LIB_VERSION_AGE)
 AC_SUBST(SP_LIB_VERSION)
 AC_SUBST(SP_LIB_LDFLAGS)
 
-# Checks for header files.
-# These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h.
-AC_CHECK_HEADERS([sys/types.h sys/stat.h fcntl.h termios.h sys/ioctl.h errno.h])
+# Checks for libraries.
+
+# This variable collects the pkg-config names of all detected libs.
+# It is then used to construct the "Requires.private:" field in the
+# libserialport.pc file.
+SP_PKGLIBS=""
 
 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"],
-		[AC_MSG_ERROR([libudev.h not found])])
+		[CFLAGS="$CFLAGS $libudev_CFLAGS"; LIBS="$LIBS $libudev_LIBS";
+		SP_PKGLIBS="$SP_PKGLIBS libudev"; AC_DEFINE(HAVE_LIBUDEV)])], [])
 	;;
 *darwin*)
 	LDFLAGS="$LDFLAGS -Wl,-framework -Wl,IOKit -Wl,-framework -Wl,CoreFoundation"
@@ -91,10 +102,19 @@ case $target_os in
 	;;
 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
 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])
@@ -104,20 +124,22 @@ 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.pc])
+AC_CONFIG_FILES([Makefile libserialport.h libserialport.pc])
 
 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"