X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=configure.ac;h=5bcc068f95422d814e97bff8bea574ad5038d04c;hp=0edc2a3c30195bf2f7793500e504c79610d8668b;hb=6a724a1e8fa7ee107b43198f7ecf5f803ddd977e;hpb=5ea98697b9f786ac73fd5152d96aebe02906a10d

diff --git a/configure.ac b/configure.ac
index 0edc2a3c..5bcc068f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,7 @@ AC_TYPE_SIZE_T
 # Checks for library functions.
 AC_FUNC_MALLOC
 AC_FUNC_MMAP
-AC_CHECK_FUNCS([gettimeofday munmap strtoul strndup strnlen])
+AC_CHECK_FUNCS([gettimeofday munmap strtoul strndup strnlen mkdtemp dirfd])
 
 # Check for MinGW32.
 MINGW32=no
@@ -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)