diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-04-24 11:41:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-04-24 11:41:24 -0400 |
| commit | 51841709bf2d709c54ee0fa27830533020b2a7d7 (patch) | |
| tree | c5e0d3839c11ab8fd6b10d819556dd6dd22e4ed7 | |
| parent | 4314d1a15ab1697235d911c9c187e1f48983048a (diff) | |
| parent | b3abf153428b8f0bbcaeb245207742f7df5fad38 (diff) | |
| download | tor-51841709bf2d709c54ee0fa27830533020b2a7d7.tar.gz tor-51841709bf2d709c54ee0fa27830533020b2a7d7.zip | |
Merge remote-tracking branch 'public/bug5103'
| -rw-r--r-- | changes/bug5103 | 3 | ||||
| -rw-r--r-- | configure.in | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/changes/bug5103 b/changes/bug5103 new file mode 100644 index 0000000000..dbc462ca79 --- /dev/null +++ b/changes/bug5103 @@ -0,0 +1,3 @@ + o Minor bugfixes (build): + - When building with --enable-static-tor on OpenBSD, do not + erroneously attempt to link -lrt. diff --git a/configure.in b/configure.in index 2a9e9b03f4..e6f379c23d 100644 --- a/configure.in +++ b/configure.in @@ -280,7 +280,12 @@ AC_SEARCH_LIBS(socket, [socket network]) AC_SEARCH_LIBS(gethostbyname, [nsl]) AC_SEARCH_LIBS(dlopen, [dl]) 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 AC_SEARCH_LIBS(pthread_create, [pthread]) |