From: "Fabio M. Di Nitto" <fdinitto@xxxxxxxxxx>
sort different sections in more logical way and add check for sed
plus a few missing headers/functions
Signed-off-by: Fabio M. Di Nitto <fdinitto@xxxxxxxxxx>
---
:100644 100644 567e9c7... 9578633... M configure.ac
configure.ac | 61 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 33 insertions(+), 28 deletions(-)
diff --git a/configure.ac b/configure.ac
index 567e9c7..9578633 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,72 +61,78 @@ AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_RANLIB
+AC_PROG_SED
+
AC_CHECK_PROGS([GROFF], [groff])
AC_CHECK_PROGS([PKGCONFIG], [pkg-config])
AC_CHECK_PROGS([AUGTOOL], [augtool])
AC_CHECK_PROGS([DOT], [dot])
AC_CHECK_PROGS([DOXYGEN], [doxygen])
AC_CHECK_PROGS([AWK], [awk])
+AC_CHECK_PROGS([SED], [sed])
-# Checks for libraries.
-AC_CHECK_LIB([dl], [dlopen])
-AC_CHECK_LIB([pthread], [pthread_create])
-AC_CHECK_LIB([socket], [socket])
-AC_CHECK_LIB([nsl], [t_open])
-AC_CHECK_LIB([rt], [sched_getscheduler])
-PKG_CHECK_MODULES([LIBQB], [libqb])
-AC_CHECK_LIB([qb], [qb_log_thread_priority_set], \
- have_qb_log_thread_priority_set="yes", \
- have_qb_log_thread_priority_set="no")
-if test "x${have_qb_log_thread_priority_set}" = xyes; then
- AC_DEFINE_UNQUOTED([HAVE_QB_LOG_THREAD_PRIORITY_SET], 1, [have qb_log_thread_priority_set])
-fi
-PKG_CHECK_MODULES([nss],[nss])
+# Checks for compiler characteristics.
+AC_PROG_GCC_TRADITIONAL
+AC_C_CONST
+AC_C_INLINE
+AC_C_VOLATILE
# Checks for header files.
-AC_FUNC_ALLOCA
AC_HEADER_DIRENT
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdint.h \
stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h \
sys/time.h syslog.h unistd.h sys/types.h getopt.h malloc.h \
- sys/sockio.h utmpx.h ifaddrs.h])
+ sys/sockio.h utmpx.h ifaddrs.h stddef.h sys/file.h])
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
+# Checks for typedefs.
AC_TYPE_UID_T
-AC_C_INLINE
AC_TYPE_INT16_T
AC_TYPE_INT32_T
AC_TYPE_INT64_T
AC_TYPE_INT8_T
-AC_TYPE_SIZE_T
-AC_TYPE_SSIZE_T
-AC_HEADER_TIME
AC_TYPE_UINT16_T
AC_TYPE_UINT32_T
AC_TYPE_UINT64_T
AC_TYPE_UINT8_T
-AC_C_VOLATILE
+AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+AC_TYPE_SIGNAL
+
+# Checks for libraries.
+PKG_CHECK_MODULES([nss],[nss])
+PKG_CHECK_MODULES([LIBQB], [libqb])
+AC_CHECK_LIB([qb], [qb_log_thread_priority_set], \
+ have_qb_log_thread_priority_set="yes", \
+ have_qb_log_thread_priority_set="no")
+if test "x${have_qb_log_thread_priority_set}" = xyes; then
+ AC_DEFINE_UNQUOTED([HAVE_QB_LOG_THREAD_PRIORITY_SET], 1, [have qb_log_thread_priority_set])
+fi
+AC_CHECK_LIB([dl], [dlopen])
+AC_CHECK_LIB([pthread], [pthread_create])
+AC_CHECK_LIB([socket], [socket])
+AC_CHECK_LIB([nsl], [t_open])
+AC_CHECK_LIB([rt], [sched_getscheduler])
# Checks for library functions.
+AC_FUNC_ALLOCA
AC_FUNC_CLOSEDIR_VOID
AC_FUNC_ERROR_AT_LINE
-AC_REPLACE_FNMATCH
AC_FUNC_FORK
-AC_PROG_GCC_TRADITIONAL
AC_FUNC_MALLOC
AC_FUNC_MEMCMP
+AC_FUNC_MMAP
AC_FUNC_REALLOC
AC_FUNC_SELECT_ARGTYPES
-AC_TYPE_SIGNAL
AC_FUNC_VPRINTF
+
AC_CHECK_FUNCS([alarm alphasort atexit bzero dup2 endgrent endpwent fcntl \
getcwd getpeerucred getpeereid gettimeofday inet_ntoa memmove \
memset mkdir scandir select socket strcasecmp strchr strdup \
strerror strrchr strspn strstr pthread_setschedparam \
- sched_get_priority_max sched_setscheduler getifaddrs])
+ sched_get_priority_max sched_setscheduler getifaddrs \
+ clock_gettime ftruncate gethostname localtime_r munmap strtol])
AC_CONFIG_FILES([Makefile
exec/Makefile
@@ -559,7 +565,6 @@ else
COVERAGE_LDFLAGS=""
fi
-
if test "x${enable_small_memory_footprint}" = xyes ; then
AC_DEFINE_UNQUOTED([HAVE_SMALL_MEMORY_FOOTPRINT], 1, [have small_memory_footprint])
PACKAGE_FEATURES="$PACKAGE_FEATURES small-memory-footprint"
--
1.7.7.6
_______________________________________________
discuss mailing list
discuss@xxxxxxxxxxxx
http://lists.corosync.org/mailman/listinfo/discuss
