[Openvpn-devel] [PATCH 27/35] build: properly detect and use socket libs

[Alon Bar-Lev]

Signed-off-by: Alon Bar-Lev <alon.bar...@gmail.com>
---
 configure.ac            |   27 +++++++++++++++++----------
 src/openvpn/Makefile.am |    3 ++-
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index e893d8d..d18e2b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -428,16 +428,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

@@ -599,6 +589,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 cc00e27..4783574 100644
--- a/src/openvpn/Makefile.am
+++ b/src/openvpn/Makefile.am
@@ -96,8 +96,9 @@ 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
-openvpn_LDADD = -lgdi32 -lws2_32 -lwininet -lcrypt32 -liphlpapi -lwinmm 
-lshell32
+openvpn_LDADD += -lgdi32 -lws2_32 -lwininet -lcrypt32 -liphlpapi -lwinmm 
-lshell32
 endif
-- 
1.7.3.4