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

diff --git a/configure.ac b/configure.ac
index a4dde9e00..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.
@@ -154,11 +155,17 @@ AC_CHECK_LIB([c], [posix_fallocate],
 ]
 )
 
+# Check for faccessat
+AC_CHECK_LIB([c], [faccessat],
+[
+	AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_FACCESSAT], 1, [Has faccessat support.])
+]
+)
+
 AC_CHECK_LIB([popt], [poptGetContext], [],
         [AC_MSG_ERROR([Cannot find popt.])]
 )
 
-
 # For Python
 # SWIG version needed or newer:
 swig_version=2.0.0
@@ -222,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)