From e3f2c133fa8d167f275bb93fff073fbbc4cdbf2f Mon Sep 17 00:00:00 2001
From: Stéphane Raimbault <stephane.raimbault@gmail.com>
Date: Wed, 24 Nov 2010 16:21:16 +0100
Subject: [PATCH] Remove inclusion of config.h in modbus.h. Closes GH-3.

---
 configure.ac         | 2 +-
 src/modbus-private.h | 1 +
 src/modbus.c         | 2 ++
 src/modbus.h         | 2 --
 tests/unit-test.h    | 2 ++
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 05edb05..7d85b9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ AC_CONFIG_SRCDIR([src/modbus.c])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign])
 # enable nice build output on automake1.11
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+#m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 LIBMODBUS_VERSION_MAJOR=libmodbus_version_major
 LIBMODBUS_VERSION_MINOR=libmodbus_version_minor
diff --git a/src/modbus-private.h b/src/modbus-private.h
index 256b26d..5b75fb7 100644
--- a/src/modbus-private.h
+++ b/src/modbus-private.h
@@ -22,6 +22,7 @@
 #include <sys/types.h>
 #include <stdint.h>
 
+#include <config.h>
 #include "modbus.h"
 
 MODBUS_BEGIN_DECLS
diff --git a/src/modbus.c b/src/modbus.c
index a5e6bbb..e98b1e1 100644
--- a/src/modbus.c
+++ b/src/modbus.c
@@ -26,6 +26,8 @@
 #include <errno.h>
 #include <limits.h>
 
+#include <config.h>
+
 #include "modbus.h"
 #include "modbus-private.h"
 
diff --git a/src/modbus.h b/src/modbus.h
index dc4f0ed..d9a2674 100644
--- a/src/modbus.h
+++ b/src/modbus.h
@@ -18,8 +18,6 @@
 #ifndef _MODBUS_H_
 #define _MODBUS_H_
 
-#include <config.h>
-
 /* Add this for macros that defined unix flavor */
 #if (defined(__unix__) || defined(unix)) && !defined(USG)
 #include <sys/param.h>
diff --git a/tests/unit-test.h b/tests/unit-test.h
index a4efd2c..25f40a7 100644
--- a/tests/unit-test.h
+++ b/tests/unit-test.h
@@ -18,6 +18,8 @@
 #ifndef _UNIT_TEST_H_
 #define _UNIT_TEST_H_
 
+#include <config.h>
+
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
 #endif
--
libgit2 0.21.4