X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=configure.ac;h=d30801df4dd28e7189bc97f42b9caa6da0d19ac7;hp=29636c8a9a2308fda195890e9a77011c22681a1c;hb=bb587d3bb4ffe846199ef4783f16e03248872685;hpb=eafa875fe957520d62bab97aea8226e0d5bda51b

diff --git a/configure.ac b/configure.ac
index 29636c8a..d30801df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,18 @@ CC="$PTHREAD_CC"
 AX_APPEND_LINK_FLAGS([-Wl,--no-as-needed], [LD_NO_AS_NEEDED])
 AC_SUBST([LD_NO_AS_NEEDED])
 
-AC_CHECK_HEADERS([fcntl.h limits.h netdb.h netinet/in.h stddef.h sys/socket.h])
+AC_HEADER_STDBOOL
+AC_CHECK_HEADERS([ \
+	fcntl.h \
+	float.h \
+	libintl.h \
+	limits.h \
+	malloc.h \
+	netdb.h \
+	netinet/in.h \
+	stddef.h \
+	sys/socket.h \
+])
 
 if test ! -f "$srcdir/formats/ctf/metadata/ctf-parser.h"; then
         if test x"$YACC" != "xbison -y"; then
@@ -79,9 +90,41 @@ AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 
 # Checks for library functions.
+AC_FUNC_ALLOCA
+AC_FUNC_FORK
 AC_FUNC_MALLOC
+AC_FUNC_MKTIME
 AC_FUNC_MMAP
-AC_CHECK_FUNCS([gettimeofday munmap strtoul strndup strnlen mkdtemp dirfd])
+AC_FUNC_REALLOC
+AC_FUNC_STRERROR_R
+AC_CHECK_FUNCS([ \
+	atexit \
+	dirfd \
+	dup2 \
+	ftruncate \
+	gethostbyname \
+	gethostname \
+	gettimeofday \
+	localtime_r \
+	memchr \
+	memset \
+	mkdir \
+	mkdtemp \
+	munmap \
+	rmdir \
+	setenv \
+	socket \
+	strchr \
+	strdup \
+	strerror \
+	strndup \
+	strnlen \
+	strrchr \
+	strtoul \
+	strtoull \
+	tzset \
+	uname \
+])
 
 # Check for MinGW32.
 MINGW32=no
@@ -197,9 +240,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)