Port: Include config.h globally trough DEFAULT_INCLUDES

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/configure.ac b/configure.ac
index 29636c8a9a2308fda195890e9a77011c22681a1c..5bcc068f95422d814e97bff8bea574ad5038d04c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -197,9 +197,12 @@ PKG_CHECK_MODULES(GMODULE, [$pkg_modules])
 AC_SUBST(PACKAGE_LIBS)
 
 LIBS="$LIBS $GMODULE_LIBS"
-PACKAGE_CFLAGS="$GMODULE_CFLAGS -Wall -Wformat -include config.h"
+PACKAGE_CFLAGS="$GMODULE_CFLAGS -Wall -Wformat"
 AC_SUBST(PACKAGE_CFLAGS)
 
+DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/include -include config.h"
+AC_SUBST(DEFAULT_INCLUDES)
+
 babeltraceincludedir="${includedir}/babeltrace"
 AC_SUBST(babeltraceincludedir)
 

diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c
index 55eabf2d1e39015910b4e1c1991627f51205c7ae..210bd09152a11b03907300c4c9b807abbad77983 100644 (file)
--- a/converter/babeltrace-log.c
+++ b/converter/babeltrace-log.c
@@ -28,8 +28,6 @@
  * Depends on glibc 2.10 for getline().
  */
 
-#define _GNU_SOURCE
-#include <config.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 0ceca0c40081ec9c4a721a47b59c33b2eb526ec7..c521ac1516c459641b24ec476f4c425ad09fcfe4 100644 (file)
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -26,8 +26,6 @@
  * SOFTWARE.
  */
 
-#define _GNU_SOURCE
-#include <config.h>
 #include <babeltrace/babeltrace.h>
 #include <babeltrace/format.h>
 #include <babeltrace/context.h>

diff --git a/include/babeltrace/compat/fcntl.h b/include/babeltrace/compat/fcntl.h
index e5232b4cb69c9e446baf9b4fec30140e8e5ff06e..47e5effc047619944599755eecabc22973527698 100644 (file)
--- a/include/babeltrace/compat/fcntl.h
+++ b/include/babeltrace/compat/fcntl.h
@@ -27,8 +27,6 @@
  * SOFTWARE.
  */
 
-#include <config.h>
-
 #ifdef BABELTRACE_HAVE_POSIX_FALLOCATE
 
 #include <fcntl.h>

diff --git a/include/babeltrace/compat/memstream.h b/include/babeltrace/compat/memstream.h
index d2a96cb5d37b57bc62ebcedaccb3bc90d107bd7d..8689aa702d8861018c3ca18b1f798ad18737abc6 100644 (file)
--- a/include/babeltrace/compat/memstream.h
+++ b/include/babeltrace/compat/memstream.h
@@ -27,9 +27,6 @@
  * SOFTWARE.
  */
 
-#define _GNU_SOURCE
-#include <config.h>
-
 #ifdef BABELTRACE_HAVE_FMEMOPEN
 #include <stdio.h>
 

diff --git a/include/babeltrace/compat/send.h b/include/babeltrace/compat/send.h
index 5654d95f4fe17e8a091a1053ae6b0a4c6415505b..98e1feb80e44f55550c7f4f352e99f960ab31aa9 100644 (file)
--- a/include/babeltrace/compat/send.h
+++ b/include/babeltrace/compat/send.h
@@ -25,8 +25,6 @@
  * SOFTWARE.
  */
 
-#include <config.h>
-
 /*
  * This wrapper is used on platforms that have no way of ignoring SIGPIPE
  * during a send(). Instead, we set the signal action to ignore. This is OK

diff --git a/include/babeltrace/compat/uuid.h b/include/babeltrace/compat/uuid.h
index 65a72704b04f9712592c7ce8bc0235a2819bc187..369e47806e1471425e8629dbde2e611fbbaf4beb 100644 (file)
--- a/include/babeltrace/compat/uuid.h
+++ b/include/babeltrace/compat/uuid.h
@@ -25,8 +25,6 @@
  * SOFTWARE.
  */
 
-#include <config.h>
-
 /* Includes final \0. */
 #define BABELTRACE_UUID_STR_LEN                37
 #define BABELTRACE_UUID_LEN            16

diff --git a/tests/lib/common.c b/tests/lib/common.c
index 25bf735eb81ad6a3442f549d8edd43edff0120e9..60e2be04244a34b821d5e93bb14a57d85530e42d 100644 (file)
--- a/tests/lib/common.c
+++ b/tests/lib/common.c
@@ -18,7 +18,6 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#define _GNU_SOURCE
 
 #include <babeltrace/context.h>
 #include <babeltrace/iterator.h>

diff --git a/tests/lib/test_bitfield.c b/tests/lib/test_bitfield.c
index 16e8a57e98d11d1fea36d910554ba94b75716de8..b14883df873ef574c5d26c83cb2f1a347bdb0d48 100644 (file)
--- a/tests/lib/test_bitfield.c
+++ b/tests/lib/test_bitfield.c
@@ -19,7 +19,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #include <babeltrace/bitfield.h>
 #include <time.h>
 #include <stdlib.h>

diff --git a/tests/lib/test_ctf_writer.c b/tests/lib/test_ctf_writer.c
index eb4b1b4def548be74949a7124f210425a6cacf45..4ea02bccb0eadf8abf15024732f690611e738cf4 100644 (file)
--- a/tests/lib/test_ctf_writer.c
+++ b/tests/lib/test_ctf_writer.c
@@ -19,7 +19,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #include <babeltrace/ctf-writer/writer.h>
 #include <babeltrace/ctf-writer/clock.h>
 #include <babeltrace/ctf-writer/stream.h>

diff --git a/tests/lib/test_seek.c b/tests/lib/test_seek.c
index 4e1a8232cc2e4a8ad131a80e28b607fd97509227..3c78e8ad89c471ffdbd07b7edd875bbf4350e8ef 100644 (file)
--- a/tests/lib/test_seek.c
+++ b/tests/lib/test_seek.c
@@ -18,7 +18,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#define _GNU_SOURCE
+
 #include <babeltrace/context.h>
 #include <babeltrace/iterator.h>
 #include <babeltrace/ctf/iterator.h>

diff --git a/tests/utils/tap/tap.c b/tests/utils/tap/tap.c
index 8bf72f6fcde57dac97fd9673cb0df5efdf9b6b0c..08dfa658ca76e4e3cdca4ab1fca7f1c694b4d791 100644 (file)
--- a/tests/utils/tap/tap.c
+++ b/tests/utils/tap/tap.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#define _GNU_SOURCE
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdio.h>