Merge remote-tracking branch 'public/bug5103'

This commit is contained in:
Nick Mathewson 2012-04-24 11:41:24 -04:00
commit 51841709bf
2 changed files with 9 additions and 1 deletions

3
changes/bug5103 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (build):
- When building with --enable-static-tor on OpenBSD, do not
erroneously attempt to link -lrt.

View File

@ -280,7 +280,12 @@ AC_SEARCH_LIBS(socket, [socket network])
AC_SEARCH_LIBS(gethostbyname, [nsl]) AC_SEARCH_LIBS(gethostbyname, [nsl])
AC_SEARCH_LIBS(dlopen, [dl]) AC_SEARCH_LIBS(dlopen, [dl])
AC_SEARCH_LIBS(inet_aton, [resolv]) AC_SEARCH_LIBS(inet_aton, [resolv])
AC_SEARCH_LIBS([clock_gettime], [rt], [have_rt=yes]) saved_LIBS="$LIBS"
AC_SEARCH_LIBS([clock_gettime], [rt])
if test "$LIBS" != "$saved_LIBS"; then
# Looks like we need -lrt for clock_gettime().
have_rt=yes
fi
if test "$enable_threads" = "yes"; then if test "$enable_threads" = "yes"; then
AC_SEARCH_LIBS(pthread_create, [pthread]) AC_SEARCH_LIBS(pthread_create, [pthread])