Fix libevent2 detection on FreeBSD

This commit is contained in:
Willem Toorop 2014-02-03 14:00:45 +01:00
parent 13127c4f6d
commit 121d3949d8
4 changed files with 78 additions and 8593 deletions

8601
aclocal.m4 vendored

File diff suppressed because it is too large Load Diff

65
configure vendored
View File

@ -7103,6 +7103,10 @@ _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=
@ -10893,6 +10897,64 @@ fi
done
if ${ac_cv_search_event_loop+:} false; then :
else
ac_cv_search_event_loop=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_event_loop" >&5
$as_echo "$ac_cv_search_event_loop" >&6; }
ac_res=$ac_cv_search_event_loop
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
else
ac_cv_search_event_loop=''
LDFLAGS="$LDFLAGS -L/usr/local/lib/event"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing event_loop" >&5
$as_echo_n "checking for library containing event_loop... " >&6; }
if ${ac_cv_search_event_loop+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char event_loop ();
int
main ()
{
return event_loop ();
;
return 0;
}
_ACEOF
for ac_lib in '' event_core event; do
if test -z "$ac_lib"; then
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_event_loop=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_event_loop+:} false; then :
break
fi
done
if ${ac_cv_search_event_loop+:} false; then :
else
ac_cv_search_event_loop=no
fi
@ -10909,6 +10971,9 @@ else
found_all_libs=0
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldns_dname_new_frm_str in -lldns" >&5
$as_echo_n "checking for ldns_dname_new_frm_str in -lldns... " >&6; }
if ${ac_cv_lib_ldns_ldns_dname_new_frm_str+:} false; then :

View File

@ -129,7 +129,11 @@ fi
# Checks for libraries.
found_all_libs=1
AC_MSG_NOTICE([Checking for dependencies libevent, ldns])
AC_SEARCH_LIBS([event_loop], [event_core event], [], [
ac_cv_search_event_loop=''
LDFLAGS="$LDFLAGS -L/usr/local/lib/event"
AC_SEARCH_LIBS([event_loop], [event_core event], [], [found_all_libs=0])
])
AC_CHECK_LIB([ldns], [ldns_dname_new_frm_str], [], [found_all_libs=0])
AC_CHECK_LIB([idn], [idna_to_ascii_8z], [], [found_all_libs=0])

View File

@ -1,4 +1,5 @@
#include <getdns/getdns.h>
#include "config.h"
#ifdef HAVE_EVENT2_EVENT_H
#include <event2/event.h>
#else