X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=17a0e5e60af47dd43cc6b00f682672a0e88583ac;hb=3842465694945829d76452ff83924aa0103c6293;hp=d9fa2119d16556c7c8ac0439eb1f170e17511b65;hpb=0bb657dcef61fb5f2a49d69d284d5714e396edf4;p=deliverable%2Fbabeltrace.git

diff --git a/configure.ac b/configure.ac
index d9fa2119d..17a0e5e60 100644
--- 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)