Port: Include config.h globally trough DEFAULT_INCLUDES

[deliverable/babeltrace.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index d9fa2119d16556c7c8ac0439eb1f170e17511b65..17a0e5e60af47dd43cc6b00f682672a0e88583ac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -95,6 +95,7 @@ AC_CHECK_FUNCS([ \
        gettimeofday munmap strtoul ftruncate gethostbyname \
        localtime_r memset mkdir rmdir setenv socket \
        strchr strdup strerror strndup strrchr strtoull tzset \
+       strnlen mkdtemp dirfd \
 ])
 
 # Check for MinGW32.
@@ -228,9 +229,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)