X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=96d5277bb23a5204682365a0582ea2f04d823250;hb=da8730199a215c9ccd938202fb55ac9e3f58a0b2;hp=3030d1d2c82735715964a0a84d7c048b0526b84a;hpb=7c3a1ee32aeae98f526120bcce51dfca00e3f16f;p=libserialport.git

diff --git a/configure.ac b/configure.ac
index 3030d1d..96d5277 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ 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_minor], [2])
 m4_define([sp_package_version_micro], [0])
 m4_define([sp_package_version], [sp_package_version_major.sp_package_version_minor.sp_package_version_micro])
 
@@ -35,12 +35,12 @@ 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])
 
-# Enable more compiler warnings via -Wall and -Wextra.
-CFLAGS="$CFLAGS -Wall -Wextra"
+# Enable more compiler warnings.
+CFLAGS="$CFLAGS -std=c99 -Wall -Wextra -pedantic"
 
 # Checks for programs.
 AC_PROG_CC
@@ -76,26 +76,37 @@ 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)
+	AM_CONDITIONAL([WIN32], false)
+	AM_CONDITIONAL([MACOSX], false)
 	;;
 *darwin*)
+	AM_CONDITIONAL([LINUX], false)
+	AM_CONDITIONAL([WIN32], false)
+	AM_CONDITIONAL([MACOSX], true)
 	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)
+	AM_CONDITIONAL([WIN32], true)
+	AM_CONDITIONAL([MACOSX], false)
+	SP_LIBS="-lsetupapi -luuid"
+	;;
+*)
+	AM_CONDITIONAL([LINUX], false)
+	AM_CONDITIONAL([WIN32], false)
+	AM_CONDITIONAL([MACOSX], false)
+	AC_DEFINE(NO_ENUMERATION)
+	AC_DEFINE(NO_PORT_METADATA)
 esac
 
 AC_SUBST(SP_PKGLIBS)
+AC_SUBST(SP_LIBS)
 
 # Define size_t if not defined as standard.
 AC_TYPE_SIZE_T
@@ -103,6 +114,29 @@ 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_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>]])
+
+# Check for serial_struct.
+AC_CHECK_TYPE([struct serial_struct], [AC_DEFINE(HAVE_SERIAL_STRUCT, 1)],
+        [], [[#include <linux/serial.h>]])
+
+saved="$CFLAGS"; CFLAGS="$CFLAGS -Werror"
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+		__attribute__((visibility("hidden"))) void foo(void) { }
+	]])],
+	[AC_DEFINE(SP_API , __attribute__((visibility("default"))))]
+	[AC_DEFINE(SP_PRIV, __attribute__((visibility("hidden"))))],
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+		__declspec(dllexport) void foo(void) { }
+	]])],
+	[AC_DEFINE(SP_API , __declspec(dllexport))]
+	[AC_DEFINE(SP_PRIV,)],
+	[AC_DEFINE(SP_API,)]
+	[AC_DEFINE(SP_PRIV,)]))
+CFLAGS="$saved"
 
 AC_SUBST(MAKEFLAGS, '--no-print-directory')
 AC_SUBST(AM_LIBTOOLFLAGS, '--silent')