diff options
author | Alon Bar-Lev <alon.barlev@gmail.com> | 2012-03-24 09:58:34 +0200 |
---|---|---|
committer | David Sommerseth <davids@redhat.com> | 2012-03-26 14:33:15 +0200 |
commit | aee7428c53483ada74ecbea70316bbaf0c461f11 (patch) | |
tree | 267c8409f702a7489f59b7e518a2802b14b04f8d | |
parent | 4df219c764bf107d9d7fb49b417269b94cc536c4 (diff) | |
download | openvpn-aee7428c53483ada74ecbea70316bbaf0c461f11.tar.gz openvpn-aee7428c53483ada74ecbea70316bbaf0c461f11.tar.xz openvpn-aee7428c53483ada74ecbea70316bbaf0c461f11.zip |
build: autoconf: misc sockets fixups
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
-rw-r--r-- | configure.ac | 53 |
1 files changed, 28 insertions, 25 deletions
diff --git a/configure.ac b/configure.ac index c6cabee..9a6ff29 100644 --- a/configure.ac +++ b/configure.ac @@ -522,6 +522,33 @@ AC_CHECK_FUNCS([ \ chsize ftruncate execve getpeereid umask basename dirname access \ epoll_create \ ]) + +AC_CHECK_LIB( + [dl], + [dlopen], + [DL_LIBS="-ldl"] +) +AC_SUBST([DL_LIBS]) + +AC_CHECK_LIB( + [nsl], + [inet_ntoa], + [SOCKETS_LIBS="${SOCKETS_LIBS} -lnsl"] +) +AC_CHECK_LIB( + [socket], + [socket], + [SOCKETS_LIBS="${SOCKETS_LIBS} -lsocket"] +) +AC_CHECK_LIB( + [resolv], + [gethostbyname], + [SOCKETS_LIBS="${SOCKETS_LIBS} -lresolv"] +) +AC_SUBST([SOCKETS_LIBS]) + +old_LIBS="${LIBS}" +LIBS="${LIBS} ${SOCKETS_LIBS}" AC_CHECK_FUNCS([sendmsg recvmsg inet_ntop inet_pton]) AC_CHECK_FUNCS( [res_init], @@ -529,7 +556,6 @@ AC_CHECK_FUNCS( , [[#include <resolv.h>]] ) - # Windows use stdcall for winsock so we cannot auto detect these m4_define( [SOCKET_FUNCS], @@ -555,30 +581,7 @@ else ) AC_CHECK_FUNCS(SOCKET_OPT_FUNCS) fi - -AC_CHECK_LIB( - [dl], - [dlopen], - [DL_LIBS="-ldl"] -) -AC_SUBST([DL_LIBS]) - -AC_CHECK_LIB( - [nsl], - [inet_ntoa], - [SOCKETS_LIBS="${SOCKETS_LIBS} -lnsl"] -) -AC_CHECK_LIB( - [socket], - [socket], - [SOCKETS_LIBS="${SOCKETS_LIBS} -lsocket"] -) -AC_CHECK_LIB( - [resolv], - [gethostbyname], - [SOCKETS_LIBS="${SOCKETS_LIBS} -lresolv"] -) -AC_SUBST([SOCKETS_LIBS]) +LIBS="${old_LIBS}" AC_CHECK_LIB( [selinux], |