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>

diff --git a/configure.ac b/configure.ac
index a0dc4624ac23cea74fd56717105b1edbe0cad3e5..c540f829221903717226725b8c3fb525cd27637d 100644 (file)
--- 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(

diff --git a/src/openvpn/Makefile.am b/src/openvpn/Makefile.am
index c7626c86d6e39230a10bd08c041d446c19880f50..86abd09b1239a85e07ddf0559bd37a0b63ad3708 100644 (file)
--- a/src/openvpn/Makefile.am
+++ b/src/openvpn/Makefile.am
@@ -96,6 +96,7 @@ openvpn_SOURCES = \
        win32.h win32.c \
        cryptoapi.h cryptoapi.c
 openvpn_LDADD = \
+       $(SOCKETS_LIBS) \
        $(OPTIONAL_DL_LIBS)
 if WIN32
 openvpn_SOURCES += openvpn_win32_resources.rc