libreplace: combine SOCKET_LIBS and NSL_LIBS to LIBREPLACE_NETWORK_LIBS

But keep the old ones untill the callers are fixed.

metze
(This used to be commit e7115dcc8a0a4f420de7a901e3a21d4f35a6fcf9)

diff --git a/source4/lib/replace/socket.m4 b/source4/lib/replace/socket.m4
index c0c8f93e81d79bd55fcc3b9dd53aec08a3f24095..ab948c1445b5ae0194e63f2d4b16c165d6cc8109 100644 (file)
--- a/source4/lib/replace/socket.m4
+++ b/source4/lib/replace/socket.m4
@@ -7,10 +7,10 @@ dnl only looks in /etc/hosts), so we only look for -lsocket if we need
 dnl it.
 AC_CHECK_FUNCS(connect)
 if test x"$ac_cv_func_connect" = x"no"; then
-       AC_CHECK_LIB_EXT(nsl_s, SOCKET_LIBS, connect)
-       AC_CHECK_LIB_EXT(nsl, SOCKET_LIBS, connect)
-       AC_CHECK_LIB_EXT(socket, SOCKET_LIBS, connect)
-       AC_CHECK_LIB_EXT(inet, SOCKET_LIBS, connect)
+       AC_CHECK_LIB_EXT(nsl_s, LIBREPLACE_NETWORK_LIBS, connect)
+       AC_CHECK_LIB_EXT(nsl, LIBREPLACE_NETWORK_LIBS, connect)
+       AC_CHECK_LIB_EXT(socket, LIBREPLACE_NETWORK_LIBS, connect)
+       AC_CHECK_LIB_EXT(inet, LIBREPLACE_NETWORK_LIBS, connect)
        dnl We can't just call AC_CHECK_FUNCS(connect) here,
        dnl because the value has been cached.
        if test x"$ac_cv_lib_ext_nsl_s_connect" = x"yes" ||
@@ -24,9 +24,9 @@ fi
 
 AC_CHECK_FUNCS(gethostbyname)
 if test x"$ac_cv_func_gethostbyname" = x"no"; then
-       AC_CHECK_LIB_EXT(nsl_s, NSL_LIBS, gethostbyname)
-       AC_CHECK_LIB_EXT(nsl, NSL_LIBS, gethostbyname)
-       AC_CHECK_LIB_EXT(socket, NSL_LIBS, gethostbyname)
+       AC_CHECK_LIB_EXT(nsl_s, LIBREPLACE_NETWORK_LIBS, gethostbyname)
+       AC_CHECK_LIB_EXT(nsl, LIBREPLACE_NETWORK_LIBS, gethostbyname)
+       AC_CHECK_LIB_EXT(socket, LIBREPLACE_NETWORK_LIBS, gethostbyname)
        dnl We can't just call AC_CHECK_FUNCS(gethostbyname) here,
        dnl because the value has been cached.
        if test x"$ac_cv_lib_ext_nsl_s_gethostbyname" = x"yes" ||
@@ -38,3 +38,5 @@ if test x"$ac_cv_func_gethostbyname" = x"no"; then
        fi
 fi
 
+SOCKET_LIBS="${LIBREPLACE_NETWORK_LIBS}"
+NSL_LIBS=""