Merge branch 'stqism-master'

This commit is contained in:
irungentoo 2014-05-21 20:51:34 -04:00
commit b25e575e7b
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98

View File

@ -139,6 +139,17 @@ AC_ARG_ENABLE([daemon],
]
)
AC_ARG_ENABLE([nort],
[AC_HELP_STRING([--disable-rt], [Disables the librt check (default: auto)]) ],
[
if test "x$enableval" = "xno"; then
DISABLE_RT="no"
elif test "x$enableval" = "xyes"; then
DISABLE_RT="yes"
fi
]
)
AC_ARG_ENABLE([testing],
[AC_HELP_STRING([--disable-testing], [build various testing tools (default: auto)]) ],
[
@ -392,7 +403,7 @@ AC_C_BIGENDIAN
# Checks for library functions.
AC_FUNC_FORK
AC_CHECK_FUNCS([gettimeofday memset socket strchr malloc])
if (test "x$WIN32" != "xyes") && (test "x$MACH" != "xyes"); then
if (test "x$WIN32" != "xyes") && (test "x$MACH" != "xyes") && (test "x$DISABLE_RT" != "xyes"); then
AC_CHECK_LIB(rt, clock_gettime,
[
RT_LIBS="-lrt"