X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=5818778912c6e033fb8aa039b353f85db08983d0;hb=5ca38cdfe07f5c8b92564c2934e65cda5cae9a8e;hp=f8123d21aa7769defe0fe607b784f7a4fcae182b;hpb=59182fbbbf79b31552f84f875485bfaee1a34270;p=libserialport.git

diff --git a/configure.ac b/configure.ac
index f8123d2..5818778 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,10 +29,13 @@ m4_define([sp_package_version], [sp_package_version_major.sp_package_version_min
 
 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])
@@ -40,7 +43,7 @@ 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"
+CFLAGS="$CFLAGS -std=c99 -Wall -Wextra -pedantic -Wmissing-prototypes -Wshadow"
 
 # Checks for programs.
 AC_PROG_CC
@@ -78,16 +81,18 @@ AC_SUBST(SP_LIB_LDFLAGS)
 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)
+	AM_CONDITIONAL([FREEBSD], 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])])
 	;;
@@ -95,14 +100,22 @@ mingw* | cygwin*)
 	AM_CONDITIONAL([LINUX], false)
 	AM_CONDITIONAL([WIN32], true)
 	AM_CONDITIONAL([MACOSX], false)
+	AM_CONDITIONAL([FREEBSD], false)
 	SP_LIBS="-lsetupapi -luuid"
 	;;
+*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)
@@ -112,12 +125,22 @@ AC_SUBST(SP_LIBS)
 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
@@ -131,14 +154,18 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #error BOTHER is not defined
 #endif
 ]])],
-[AC_DEFINE(HAVE_BOTHER, 1)
+[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) { }
 	]])],