diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-03-18 14:52:36 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-03-18 16:34:12 +0100 |
| commit | 0a80f6bfb469557556a33337aa30f6d9c853de44 (patch) | |
| tree | e470aac86c7342d85c3625f0aeff01f5e21c0550 /source3 | |
| parent | 37e04236bb59491e13c378edda2ac2686c7dbca1 (diff) | |
| download | samba-0a80f6bfb469557556a33337aa30f6d9c853de44.tar.gz samba-0a80f6bfb469557556a33337aa30f6d9c853de44.tar.bz2 samba-0a80f6bfb469557556a33337aa30f6d9c853de44.zip | |
libreplace: combine SOCKET_LIBS and NSL_LIBS to LIBREPLACE_NETWORK_LIBS
But keep the old ones untill the callers are fixed.
metze
(cherry picked from commit e7115dcc8a0a4f420de7a901e3a21d4f35a6fcf9)
(This used to be commit 2dee62ed12910a4d22381677bcf884dca0d999ea)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/replace/socket.m4 | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/source3/lib/replace/socket.m4 b/source3/lib/replace/socket.m4 index c0c8f93e81..ab948c1445 100644 --- a/source3/lib/replace/socket.m4 +++ b/source3/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="" |