r15376: Add detection of -lnsl, required for building on SUN boxes.

(This used to be commit 49bac12767ca59095ad6609a3826f7f17ddb601c)

diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index 27f1f1afb9e641854e86ab2752c4c9abe3ab9dcb..c60e95e0c4a422f1004c3109001788aa566d5048 100644 (file)
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -25,7 +25,7 @@ PRIVATE_PROTO_HEADER = netif/proto.h
 OBJ_FILES = \
                netif/interface.o \
                netif/netif.o
-PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
+PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL EXT_NSL
 # End SUBSYSTEM LIBNETIF
 ##############################
 

diff --git a/source4/lib/socket/config.m4 b/source4/lib/socket/config.m4
index 45e5406f0c1ae0bdc06c5a2b1580672799f4ab9b..cb593ea184918d1d32a45b70fe03cbc07bd6960f 100644 (file)
--- a/source4/lib/socket/config.m4
+++ b/source4/lib/socket/config.m4
@@ -37,6 +37,23 @@ fi
 
 SMB_EXT_LIB(EXT_SOCKET,[${SOCKET_LIBS}],[${SOCKET_CFLAGS}],[${SOCKET_CPPFLAGS}],[${SOCKET_LDFLAGS}])
 
+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)
+    SMB_ENABLE(EXT_NSL,YES)
+    dnl We can't just call AC_CHECK_FUNCS(gethostbyname) here, because the value
+    dnl has been cached.
+    if test x"$ac_cv_lib_ext_nsl_s_gethostbyname" != x"yes" &&
+       test x"$ac_cv_lib_ext_nsl_gethostbyname" != x"yes" &&
+       test x"$ac_cv_lib_ext_socket_gethostbyname" != x"yes"; then
+               AC_MSG_ERROR([no gethostbyname() function available!])
+    fi
+fi
+
+SMB_EXT_LIB(EXT_NSL,[${NSL_LIBS}],[],[],[])
+
 ############################################
 # check for unix domain sockets
 AC_CACHE_CHECK([for unix domain sockets],samba_cv_unixsocket, [

diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk
index d0b19e1ecf28da57a0ed6ddb666d68fac3117c59..fc3f59b580f4b3608eba057bb677998b2acc6517 100644 (file)
--- a/source4/lib/socket/config.mk
+++ b/source4/lib/socket/config.mk
@@ -6,8 +6,8 @@ SUBSYSTEM = LIBSAMBA-SOCKET
 OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
                socket_ipv4.o
-PUBLIC_DEPENDENCIES = EXT_SOCKET
-PRIVATE_DEPENDENCIES = LIBSAMBA-ERRORS
+PUBLIC_DEPENDENCIES = EXT_SOCKET EXT_NSL
+PRIVATE_DEPENDENCIES = LIBSAMBA-ERRORS 
 # End MODULE socket_ipv4
 ################################################
 
@@ -18,7 +18,7 @@ SUBSYSTEM = LIBSAMBA-SOCKET
 OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
                socket_ipv6.o
-PUBLIC_DEPENDENCIES = EXT_SOCKET
+PUBLIC_DEPENDENCIES = EXT_SOCKET EXT_NSL
 # End MODULE socket_ipv6
 ################################################
 
@@ -29,7 +29,7 @@ SUBSYSTEM = LIBSAMBA-SOCKET
 OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
                socket_unix.o
-PUBLIC_DEPENDENCIES = EXT_SOCKET
+PUBLIC_DEPENDENCIES = EXT_SOCKET EXT_NSL
 # End MODULE socket_unix
 ################################################
 

diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk
index a14ffb5f795d96698697f639e408a7e31790a97c..4e00e2d7e24f8be94ad4e1ed2c37c80ab372d6de 100644 (file)
--- a/source4/lib/util/config.mk
+++ b/source4/lib/util/config.mk
@@ -31,7 +31,7 @@ OBJ_FILES = xfile.o \
                module.o
 PUBLIC_DEPENDENCIES = \
                LIBREPLACE LIBCRYPTO DL LIBTALLOC \
-               SOCKET_WRAPPER
+               SOCKET_WRAPPER EXT_NSL
 
 [SUBSYSTEM::PIDFILE]
 PRIVATE_PROTO_HEADER = pidfile.h

diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index fbc76b32a05ecc69b91645a1a4245c0baded4ee8..895caa69120ad82e57d804566c9964bffe8c2c4f 100644 (file)
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -11,7 +11,7 @@ OBJ_FILES = \
                ndr/ndr_basic.o \
                ndr/ndr_string.o \
                ndr/ndr_misc.o
-PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBSAMBA-UTIL CHARSET
+PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBSAMBA-UTIL CHARSET EXT_NSL
 # End SUBSYSTEM LIBNDR
 ################################################