Commit 6055bba8 authored by Nick Mathewson's avatar Nick Mathewson 🎨
Browse files

Only use -levent when checking functions if we will use it to link.

Fixes 19904; bugfix on b62abf9f; patch from Rubiate.
parent fdc0a660
o Minor bugfixes (compilation, OpenBSD):
- Detect Libevent2 functions correctly on systems that provide
libevent2, but where libevent1 is linked with -levent. Fixes bug
19904; bugfix on 0.2.2.24-alpha. Patch from Rubiate.
...@@ -490,21 +490,17 @@ void *event_init(void);], ...@@ -490,21 +490,17 @@ void *event_init(void);],
event_init(); event_init();
], [--with-libevent-dir], [/opt/libevent]) ], [--with-libevent-dir], [/opt/libevent])
dnl Now check for particular libevent functions. dnl Determine the incantation needed to link libevent.
save_LIBS="$LIBS" save_LIBS="$LIBS"
save_LDFLAGS="$LDFLAGS" save_LDFLAGS="$LDFLAGS"
save_CPPFLAGS="$CPPFLAGS" save_CPPFLAGS="$CPPFLAGS"
LIBS="-levent $STATIC_LIBEVENT_FLAGS $TOR_LIB_WS32 $LIBS"
LIBS="$STATIC_LIBEVENT_FLAGS $TOR_LIB_WS32 $save_LIBS"
LDFLAGS="$TOR_LDFLAGS_libevent $LDFLAGS" LDFLAGS="$TOR_LDFLAGS_libevent $LDFLAGS"
CPPFLAGS="$TOR_CPPFLAGS_libevent $CPPFLAGS" CPPFLAGS="$TOR_CPPFLAGS_libevent $CPPFLAGS"
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) 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 if test "$enable_static_libevent" = "yes"; then
if test "$tor_cv_library_libevent_dir" = "(system)"; then if test "$tor_cv_library_libevent_dir" = "(system)"; then
AC_MSG_ERROR("You must specify an explicit --with-libevent-dir=x option when using --enable-static-libevent") AC_MSG_ERROR("You must specify an explicit --with-libevent-dir=x option when using --enable-static-libevent")
...@@ -527,6 +523,11 @@ else ...@@ -527,6 +523,11 @@ else
fi fi
fi fi
dnl Now check for particular libevent functions.
AC_CHECK_FUNCS([evutil_secure_rng_set_urandom_device_file \
evutil_secure_rng_add_bytes \
])
LIBS="$save_LIBS" LIBS="$save_LIBS"
LDFLAGS="$save_LDFLAGS" LDFLAGS="$save_LDFLAGS"
CPPFLAGS="$save_CPPFLAGS" CPPFLAGS="$save_CPPFLAGS"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment