[tor-commits] [tor/master] Fix libevent linking on openbsd.

[nickm at torproject.org]

commit fe9cfeba6ec96c11d009f4d57bf03f0019e34c9d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 8 10:08:29 2016 -0400

    Fix libevent linking on openbsd.
    
    Closes ticket 19902; bugfix on 0.2.9.1-alpha; patch from rubiate
---
 changes/bug19902 | 5 +++++
 configure.ac     | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/changes/bug19902 b/changes/bug19902
new file mode 100644
index 0000000..297570e
--- /dev/null
+++ b/changes/bug19902
@@ -0,0 +1,5 @@
+  o Major bugfixes (compilation, OpenBSD):
+
+    - Fix a Libevent-detection bug in our autoconf script that would
+      prevent Tor from linking successfully on OpenBSD. Patch from
+      rubiate. Fixes bug 19902; bugfix on 0.2.9.1-alpha.
diff --git a/configure.ac b/configure.ac
index ed57757..fc27017 100644
--- a/configure.ac
+++ b/configure.ac
@@ -501,6 +501,8 @@ AC_CHECK_FUNCS([evutil_secure_rng_set_urandom_device_file \
                 evutil_secure_rng_add_bytes \
 ])
 
+AC_CHECK_HEADERS(event2/event.h event2/dns.h event2/bufferevent_ssl.h)
+
 LIBS="$STATIC_LIBEVENT_FLAGS $TOR_LIB_WS32 $save_LIBS"
 
 if test "$enable_static_libevent" = "yes"; then
@@ -521,7 +523,7 @@ else
          TOR_LIBEVENT_LIBS="$ac_cv_search_evdns_base_new $TOR_LIBEVENT_LIBS"
        fi
      else
-       TOR_LIBEVENT_LIBS="-levent"
+       AC_MSG_ERROR("libevent2 is required but the headers could not be found")
      fi
 fi