diff options
| author | Alon Bar-Lev <alon.barlev@gmail.com> | 2012-02-29 22:12:03 +0200 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2012-03-22 22:17:26 +0100 |
| commit | 7647a48c2d2c446ee387316389085fe83c6ef894 (patch) | |
| tree | 6c7871775f817c6dced197f8de3cb72951d04354 /configure.ac | |
| parent | bdae41107ddde61cae5ae2037c1420b539c52ff8 (diff) | |
| download | openvpn-7647a48c2d2c446ee387316389085fe83c6ef894.tar.gz openvpn-7647a48c2d2c446ee387316389085fe83c6ef894.tar.xz openvpn-7647a48c2d2c446ee387316389085fe83c6ef894.zip | |
build: properly detect and use socket libs
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>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index a0dc462..c540f82 100644 --- a/configure.ac +++ b/configure.ac @@ -442,16 +442,6 @@ if test "${WIN32}" != "yes"; then [[${SOCKET_INCLUDES}]] ) - AC_CHECK_DECLS( - [SO_MARK], - , - , - [[${SOCKET_INCLUDES}]] - ) - - AC_SEARCH_LIBS([socket], [socket]) - AC_SEARCH_LIBS([inet_ntoa], [nsl]) - AC_SEARCH_LIBS([gethostbyname], [resolv nsl]) AC_FUNC_FORK fi @@ -613,6 +603,23 @@ AC_CHECK_LIB( ) 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]) + case "${with_mem_check}" in valgrind) AC_CHECK_HEADER( |