svn commit: samba r15376 - in branches/SAMBA_4_0/source: lib lib/socket lib/util librpc

[jelmer at samba.org]

Author: jelmer
Date: 2006-05-01 13:39:36 +0000 (Mon, 01 May 2006)
New Revision: 15376

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15376

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

Modified:
   branches/SAMBA_4_0/source/lib/basic.mk
   branches/SAMBA_4_0/source/lib/socket/config.m4
   branches/SAMBA_4_0/source/lib/socket/config.mk
   branches/SAMBA_4_0/source/lib/util/config.mk
   branches/SAMBA_4_0/source/librpc/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/lib/basic.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/basic.mk	2006-05-01 13:20:05 UTC (rev 15375)
+++ branches/SAMBA_4_0/source/lib/basic.mk	2006-05-01 13:39:36 UTC (rev 15376)
@@ -25,7 +25,7 @@
 OBJ_FILES = \
 		netif/interface.o \
 		netif/netif.o
-PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
+PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL EXT_NSL
 # End SUBSYSTEM LIBNETIF
 ##############################
 

Modified: branches/SAMBA_4_0/source/lib/socket/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/socket/config.m4	2006-05-01 13:20:05 UTC (rev 15375)
+++ branches/SAMBA_4_0/source/lib/socket/config.m4	2006-05-01 13:39:36 UTC (rev 15376)
@@ -37,6 +37,23 @@
 
 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, [

Modified: branches/SAMBA_4_0/source/lib/socket/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/socket/config.mk	2006-05-01 13:20:05 UTC (rev 15375)
+++ branches/SAMBA_4_0/source/lib/socket/config.mk	2006-05-01 13:39:36 UTC (rev 15376)
@@ -6,8 +6,8 @@
 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 @@
 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 @@
 OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
 		socket_unix.o
-PUBLIC_DEPENDENCIES = EXT_SOCKET
+PUBLIC_DEPENDENCIES = EXT_SOCKET EXT_NSL
 # End MODULE socket_unix
 ################################################
 

Modified: branches/SAMBA_4_0/source/lib/util/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/util/config.mk	2006-05-01 13:20:05 UTC (rev 15375)
+++ branches/SAMBA_4_0/source/lib/util/config.mk	2006-05-01 13:39:36 UTC (rev 15376)
@@ -31,7 +31,7 @@
 		module.o
 PUBLIC_DEPENDENCIES = \
 		LIBREPLACE LIBCRYPTO DL LIBTALLOC \
-		SOCKET_WRAPPER
+		SOCKET_WRAPPER EXT_NSL
 
 [SUBSYSTEM::PIDFILE]
 PRIVATE_PROTO_HEADER = pidfile.h

Modified: branches/SAMBA_4_0/source/librpc/config.mk
===================================================================
--- branches/SAMBA_4_0/source/librpc/config.mk	2006-05-01 13:20:05 UTC (rev 15375)
+++ branches/SAMBA_4_0/source/librpc/config.mk	2006-05-01 13:39:36 UTC (rev 15376)
@@ -11,7 +11,7 @@
 		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
 ################################################