[tor-commits] [tor/master] Fix --enable-static-tor on OpenBSD

[nickm at torproject.org]

commit b3abf153428b8f0bbcaeb245207742f7df5fad38
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Feb 12 19:54:13 2012 -0500

    Fix --enable-static-tor on OpenBSD
    
    Previously we'd been using "we have clock_gettime()" as a proxy for
    "we need -lrt to link a static libevent".  But that's not really
    accurate: we should only add -lrt if searching for clock_gettime
    function adds -lrt to our libraries.
---
 changes/bug5103 |    3 +++
 configure.in    |    7 ++++++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/changes/bug5103 b/changes/bug5103
new file mode 100644
index 0000000..dbc462c
--- /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 ef571b8..b37a89d 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])