Generate a config.h rather than passing defines on command line.

Fixes bug #553.

diff --git a/.gitignore b/.gitignore
index 93961f57ceab3792545cb44883b8e77cd6359db5..1dfa716cdd1058e4f4451d9daead0fe083a682e1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@ Makefile.in
 aclocal.m4
 autom4te.cache/
 autostuff/
+config.h.in
+config.h
 config.log
 config.status
 configure
@@ -13,5 +15,6 @@ libserialport.la
 libserialport.pc
 libserialport.h
 libtool
+stamp-h1
 *.o
 *.lo

diff --git a/autogen.sh b/autogen.sh
index 4267387d7a490d2e9fe4c1068d3b0d1d5e3d1d23..ae396319fab474cec0b8d16285c45278387e473c 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -55,6 +55,7 @@ fi
 echo "Generating build system..."
 ${LIBTOOLIZE} --install --copy --quiet || exit 1
 aclocal ${ACLOCAL_DIR} || exit 1
+autoheader || exit 1
 automake --add-missing --copy || exit 1
 autoconf || exit 1
 

diff --git a/configure.ac b/configure.ac
index 4cd1278cd171ef430352d268a3568dfd7ec0c6d0..86d4eb60e414e7befc80ac35eaf533f466bd008d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,7 @@ 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])
 
@@ -111,8 +112,8 @@ mingw* | cygwin*)
        AM_CONDITIONAL([WIN32], false)
        AM_CONDITIONAL([MACOSX], false)
        AM_CONDITIONAL([FREEBSD], false)
-       AC_DEFINE(NO_ENUMERATION)
-       AC_DEFINE(NO_PORT_METADATA)
+       AC_DEFINE(NO_ENUMERATION,,[Enumeration is unsupported])
+       AC_DEFINE(NO_PORT_METADATA,,[Port metadata is unavailable])
 esac
 
 AC_SUBST(SP_PKGLIBS)
@@ -122,12 +123,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
@@ -141,14 +152,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) { }
        ]])],

diff --git a/libserialport_internal.h b/libserialport_internal.h
index 28c307602063032809a50c5402b877044736ff8e..9d8e41fe3cf7fe8402310c0173060c1c04ac00ab 100644 (file)
--- a/libserialport_internal.h
+++ b/libserialport_internal.h
@@ -18,6 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
+
 #ifdef __linux__
 #define _BSD_SOURCE // for timeradd, timersub, timercmp
 #endif