Port: cleanup and portability fix to configure.ac

[babeltrace.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ac6ee14affb76e4a0e2809eac480c4292d368da1..18321ba9cc58a32cd2c05e57a04f04d20d5d70c0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,3 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
 AC_PREREQ([2.50])
 AC_INIT([babeltrace],[1.3.0-pre],[jeremie dot galarneau at efficios dot com])
 
@@ -8,28 +5,38 @@ AC_INIT([babeltrace],[1.3.0-pre],[jeremie dot galarneau at efficios dot com])
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 AC_SUBST([BABELTRACE_LIBRARY_VERSION], [1:0:0])
 
+AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIR([m4])
+
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
+
 AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
 AM_MAINTAINER_MODE([enable])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-AC_CONFIG_MACRO_DIR([m4])
-
-AC_PROG_MKDIR_P
-AC_PROG_LN_S
 
-AC_CONFIG_HEADERS([config.h])
+# Enable silent rules if available (Introduced in AM 1.11)
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
+# Checks for C compiler
+AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
+AC_PROG_CC
+AC_PROG_CC_STDC
 
 # Checks for programs.
-AC_PROG_CC_STDC
 AC_PROG_MAKE_SET
 LT_INIT
 AC_PROG_YACC
 AC_PROG_LEX
+AC_PROG_MKDIR_P
+AC_PROG_LN_S
+
+# Check linker option
+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])
 
 if test ! -f "$srcdir/formats/ctf/metadata/ctf-parser.h"; then
         if test x"$YACC" != "xbison -y"; then
@@ -60,12 +67,22 @@ AM_PATH_GLIB_2_0(2.22.0, ,AC_MSG_ERROR([glib is required in order to compile Bab
 AC_C_INLINE
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
+AC_TYPE_INT16_T
+AC_TYPE_INT32_T
+AC_TYPE_INT64_T
+AC_TYPE_INT8_T
+AC_TYPE_OFF_T
+AC_TYPE_SSIZE_T
+AC_TYPE_UINT16_T
+AC_TYPE_UINT32_T
+AC_TYPE_UINT64_T
+AC_TYPE_UINT8_T
 
 # Checks for library functions.
 AC_FUNC_MALLOC
 AC_FUNC_MMAP
 AC_CHECK_FUNCS([ \
-       bzero gettimeofday munmap strtoul ftruncate gethostbyname \
+       gettimeofday munmap strtoul ftruncate gethostbyname \
        localtime_r memset mkdir rmdir setenv socket \
        strchr strdup strerror strndup strrchr strtoull tzset \
 ])
@@ -79,6 +96,9 @@ 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],
 [