X-Git-Url: http://sigrok.org/gitweb/?p=libserialport.git;a=blobdiff_plain;f=configure.ac;h=e569ee07f2dd296d8b4aa147929e8055f31efe15;hp=96d5277bb23a5204682365a0582ea2f04d823250;hb=ec4b55ae25c368e30a5db6ab6cb33bb6abeca46c;hpb=653cef3ab1a71a76c8c5a503af6ce74b731ecc42

diff --git a/configure.ac b/configure.ac
index 96d5277..e569ee0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,25 +23,25 @@ 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], [2])
-m4_define([sp_package_version_micro], [0])
+m4_define([sp_package_version_minor], [1])
+m4_define([sp_package_version_micro], [1])
 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])
+AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([autostuff])
 AC_CONFIG_AUX_DIR([autostuff])
 
-AC_CANONICAL_TARGET
+AH_TOP([#ifndef SP_CONFIG_H
+#define SP_CONFIG_H])
+AH_BOTTOM([#endif])
 
 # We require at least automake 1.11 (needed for 'silent rules').
 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.
-CFLAGS="$CFLAGS -std=c99 -Wall -Wextra -pedantic"
-
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_CPP
@@ -72,67 +72,100 @@ AC_SUBST(SP_LIB_LDFLAGS)
 
 # 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=""
 SP_LIBS=""
 
-case $target_os in
+case $host_os in
 *linux*)
 	AM_CONDITIONAL([LINUX], true)
 	AM_CONDITIONAL([WIN32], false)
 	AM_CONDITIONAL([MACOSX], false)
+	AM_CONDITIONAL([FREEBSD], false)
 	;;
 *darwin*)
 	AM_CONDITIONAL([LINUX], false)
 	AM_CONDITIONAL([WIN32], false)
 	AM_CONDITIONAL([MACOSX], true)
-	LDFLAGS="$LDFLAGS -Wl,-framework -Wl,IOKit -Wl,-framework -Wl,CoreFoundation"
+	AM_CONDITIONAL([FREEBSD], false)
 	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([FREEBSD], false)
+	SP_LIBS="-lsetupapi"
+	;;
+*freebsd*)
+	AM_CONDITIONAL([LINUX], false)
+	AM_CONDITIONAL([WIN32], false)
+	AM_CONDITIONAL([MACOSX], false)
+	AM_CONDITIONAL([FREEBSD], true)
 	;;
 *)
 	AM_CONDITIONAL([LINUX], false)
 	AM_CONDITIONAL([WIN32], false)
 	AM_CONDITIONAL([MACOSX], false)
-	AC_DEFINE(NO_ENUMERATION)
-	AC_DEFINE(NO_PORT_METADATA)
+	AM_CONDITIONAL([FREEBSD], false)
+	AC_DEFINE(NO_ENUMERATION,,[Enumeration is unsupported])
+	AC_DEFINE(NO_PORT_METADATA,,[Port metadata is unavailable])
 esac
 
-AC_SUBST(SP_PKGLIBS)
 AC_SUBST(SP_LIBS)
 
 # 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,
+		[struct termios2 is available.])],
+	[], [[#include <linux/termios.h>]])
+AC_CHECK_TYPE([struct termiox],
+	[AC_DEFINE(HAVE_TERMIOX, 1,
+		[struct termiox is available.])],
+	[], [[#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_DEFINE(HAVE_TERMIOS_SPEED, 1,
+		[struct termios has c_ispeed/c_ospeed.])],
+	[], [[#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_DEFINE(HAVE_TERMIOS2_SPEED, 1,
+		[struct termios2 has c_ispeed/c_ospeed.])],
+	[], [[#include <linux/termios.h>]])
+
+# Check for the BOTHER definition, needed for setting arbitrary baud rates.
+# We can't just #ifdef BOTHER in the code, because of the separation between
+# code using libc headers and code using kernel termios.h headers.
+AC_MSG_CHECKING(for BOTHER)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <linux/termios.h>
+]],
+[[
+#ifndef BOTHER
+#error BOTHER is not defined
+#endif
+]])],
+[AC_DEFINE(HAVE_BOTHER, 1, [BOTHER macro is available])
+AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
 
 # Check for serial_struct.
-AC_CHECK_TYPE([struct serial_struct], [AC_DEFINE(HAVE_SERIAL_STRUCT, 1)],
+AC_CHECK_TYPE([struct serial_struct],
+	[AC_DEFINE(HAVE_SERIAL_STRUCT, 1,
+		[struct serial is available.])],
         [], [[#include <linux/serial.h>]])
 
 saved="$CFLAGS"; CFLAGS="$CFLAGS -Werror"
+AC_DEFINE(SP_API,,[Macro preceding public API functions])
+AC_DEFINE(SP_PRIV,,[Macro preceding private functions])
 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 		__attribute__((visibility("hidden"))) void foo(void) { }
 	]])],
-	[AC_DEFINE(SP_API , __attribute__((visibility("default"))))]
+	[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_API, __declspec(dllexport))]
 	[AC_DEFINE(SP_PRIV,)],
 	[AC_DEFINE(SP_API,)]
 	[AC_DEFINE(SP_PRIV,)]))