Fix: check for socket lib before function checks

[babeltrace.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9757663f47f9aba70edebaf6550535a83928facb..f66104648324b2bd3f96efa78f6e4a11cd596c7e 100644 (file)
--- 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
@@ -70,18 +81,52 @@ if test ! -f "$srcdir/formats/ctf/metadata/ctf-lexer.c"; then
         ])
 fi
 
-
 AM_PATH_GLIB_2_0(2.22.0, ,AC_MSG_ERROR([glib is required in order to compile BabelTrace - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule)
 
+# Check what libraries are required on this platform to link sockets programs.
+AX_LIB_SOCKET_NSL
+
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
 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])
+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
@@ -92,9 +137,6 @@ esac
 
 AM_CONDITIONAL([BABELTRACE_BUILD_WITH_MINGW], [test "x$MINGW32" = "xyes"])
 
-# Check what libraries are required on this platform to link sockets programs.
-AX_LIB_SOCKET_NSL
-
 # Check for libuuid
 AC_CHECK_LIB([uuid], [uuid_generate],
 [
@@ -197,9 +239,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)