GitHub/libevent
1
0
Fork 0
mirror of https://github.com/libevent/libevent.git synced 2025-01-31 09:12:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/patches-2.0'

Browse Source
This commit is contained in:
Nick Mathewson 2011-02-01 02:12:46 -05:00
commit 86f02d7533
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.in
View File

@ -212,6 +212,8 @@ AC_HEADER_TIME
dnl Checks for library functions. dnl Checks for library functions.
AC_CHECK_FUNCS(gettimeofday vasprintf fcntl clock_gettime strtok_r strsep getaddrinfo getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random arc4random_buf issetugid geteuid getegid getservbyname getprotobynumber setenv unsetenv putenv) AC_CHECK_FUNCS(gettimeofday vasprintf fcntl clock_gettime strtok_r strsep getaddrinfo getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random arc4random_buf issetugid geteuid getegid getservbyname getprotobynumber setenv unsetenv putenv)
if test "$ac_cv_func_getaddrinfo" != "yes" ; then
# Check for gethostbyname_r in all its glorious incompatible versions. # Check for gethostbyname_r in all its glorious incompatible versions.
# (This is cut-and-pasted from Tor, which based its logic on # (This is cut-and-pasted from Tor, which based its logic on
# Python's configure.in.) # Python's configure.in.)
@ -268,6 +270,7 @@ AC_CHECK_FUNC(gethostbyname_r, [
CFLAGS=$OLD_CFLAGS CFLAGS=$OLD_CFLAGS
]) ])
fi
AC_CHECK_SIZEOF(long) AC_CHECK_SIZEOF(long)

16
test/test.sh
View File

@ -7,12 +7,18 @@ then
TEST_OUTPUT_FILE=/dev/null TEST_OUTPUT_FILE=/dev/null
fi fi
# /bin/echo is a little more likely to support -n than sh's builtin echo. # /bin/echo is a little more likely to support -n than sh's builtin echo,
if test -x /bin/echo # printf is even more likely
if test "`printf hello 2>&1`" = "hello"
then then
ECHO=/bin/echo ECHO_N="printf"
else else
ECHO=echo if test -x /bin/echo
then
ECHO_N="/bin/echo -n"
else
ECHO_N="echo -n"
fi
fi fi
if test "$TEST_OUTPUT_FILE" != "/dev/null" if test "$TEST_OUTPUT_FILE" != "/dev/null"
@ -45,7 +51,7 @@ announce () {
} }
announce_n () { announce_n () {
$ECHO -n "$@" $ECHO_N "$@"
echo "$@" >>"$TEST_OUTPUT_FILE" echo "$@" >>"$TEST_OUTPUT_FILE"
} }