Skip to content

Commit

Permalink
Allow piggybacking on libunbouns libevent
Browse files Browse the repository at this point in the history
  • Loading branch information
wtoorop committed Jun 3, 2014
1 parent 40e6e8b commit feb29ab
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
22 changes: 11 additions & 11 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -7132,10 +7132,6 @@ _lt_linker_boilerplate=`cat conftest.err`
$RM -r conftest*


## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
## the running order or otherwise move them around unless you know exactly
## what you are doing...
if test -n "$compiler"; then

lt_prog_compiler_no_builtin_flag=
Expand Down Expand Up @@ -9690,14 +9686,10 @@ fi
# before this can be enabled.
hardcode_into_libs=yes

# Add ABI-specific directories to the system library path.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"

# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"

sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi

# We used to test for /lib/ld.so.1 and disable shared libraries on
Expand Down Expand Up @@ -11279,7 +11271,11 @@ if test "x$ac_cv_header_event2_event_h" = xyes; then :
#define HAVE_EVENT2_EVENT_H 1
_ACEOF
have_libevent=1
EXTENSION_LIBEVENT_EXT_LIBS="$ac_cv_search_event_loop"
if test "x_$ac_cv_search_event_loop" = "x_none required"; then :

else
EXTENSION_LIBEVENT_EXT_LIBS="$ac_cv_search_event_loop"
fi
else
for ac_header in event.h
do :
Expand All @@ -11293,7 +11289,11 @@ if test "x$ac_cv_header_event_h" = xyes; then :
#define HAVE_EVENT_H 1
_ACEOF
have_libevent=1
EXTENSION_LIBEVENT_EXT_LIBS="$ac_cv_search_event_loop"
if test "x_$ac_cv_search_event_loop" = "x_none required"; then :

else
EXTENSION_LIBEVENT_EXT_LIBS="$ac_cv_search_event_loop"
fi
else
as_fn_error $? "event2/event.h and event.h missing, try without libevent" "$LINENO" 5
have_libevent=0
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,10 @@ AS_IF([test x_$withval = x_no],
[AC_CHECK_FUNCS([event_base_new event_base_free])]
[AC_CHECK_HEADERS([event2/event.h],
[have_libevent=1]
[EXTENSION_LIBEVENT_EXT_LIBS="$ac_cv_search_event_loop"],
[AS_IF([test "x_$ac_cv_search_event_loop" = "x_none required"],[],[EXTENSION_LIBEVENT_EXT_LIBS="$ac_cv_search_event_loop"])],
[AC_CHECK_HEADERS([event.h],
[have_libevent=1]
[EXTENSION_LIBEVENT_EXT_LIBS="$ac_cv_search_event_loop"],
[AS_IF([test "x_$ac_cv_search_event_loop" = "x_none required"],[],[EXTENSION_LIBEVENT_EXT_LIBS="$ac_cv_search_event_loop"])],
[AC_MSG_ERROR([event2/event.h and event.h missing, try without libevent])]
[have_libevent=0],
[AC_INCLUDES_DEFAULT]
Expand Down

0 comments on commit feb29ab

Please sign in to comment.