svn commit: samba r10531 - in branches/SAMBA_4_0/source: heimdal_build lib/socket

[jelmer at samba.org]

Author: jelmer
Date: 2005-09-27 10:32:49 +0000 (Tue, 27 Sep 2005)
New Revision: 10531

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

Log:
(hopefully) improve detection of socket-related functions in external libraries

Modified:
   branches/SAMBA_4_0/source/heimdal_build/config.mk
   branches/SAMBA_4_0/source/lib/socket/config.m4
   branches/SAMBA_4_0/source/lib/socket/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/config.mk	2005-09-27 10:31:57 UTC (rev 10530)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk	2005-09-27 10:32:49 UTC (rev 10531)
@@ -324,7 +324,6 @@
 			HEIMDAL_ROKEN_ADDRINFO \
 			HEIMDAL_ROKEN_GAI_STRERROR \
 			HEIMDAL_ROKEN_INET_ATON \
-			EXT_LIB_SOCKET \
 			EXT_LIB_XNET
 NOPROTO = YES
 # End SUBSYSTEM HEIMDAL_ROKEN

Modified: branches/SAMBA_4_0/source/lib/socket/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/socket/config.m4	2005-09-27 10:31:57 UTC (rev 10530)
+++ branches/SAMBA_4_0/source/lib/socket/config.m4	2005-09-27 10:32:49 UTC (rev 10531)
@@ -18,32 +18,17 @@
 # it.
 AC_CHECK_FUNCS(connect)
 if test x"$ac_cv_func_connect" = x"no"; then
-    case "$LIBS $SOCKET_LIBS" in
-    *-lnsl*) ;;
-    *) AC_CHECK_LIB_EXT(nsl_s, SOCKET_LIBS, printf) ;;
-    esac
-    case "$LIBS $SOCKET_LIBS" in
-    *-lnsl*) ;;
-    *) AC_CHECK_LIB_EXT(nsl, SOCKET_LIBS, printf) ;;
-    esac
-    case "$LIBS $SOCKET_LIBS" in
-    *-lsocket*) ;;
-    *) AC_CHECK_LIB_EXT(socket,  SOCKET_LIBS, connect) ;;
-    esac
-    case "$LIBS $SOCKET_LIBS" in
-    *-linet*) ;;
-    *) AC_CHECK_LIB_EXT(inet, SOCKET_LIBS, connect) ;;
-    esac
+    AC_CHECK_LIB(nsl_s, printf)
+    AC_CHECK_LIB(nsl, printf)
+    AC_CHECK_LIB(socket, connect)
+    AC_CHECK_LIB_EXT(inet, connect)
     dnl We can't just call AC_CHECK_FUNCS(connect) here, because the value
     dnl has been cached.
     if test x"$ac_cv_lib_ext_socket_connect" = x"yes" ||
        test x"$ac_cv_lib_ext_inet_connect" = x"yes"; then
-        # ac_cv_func_connect=yes
-        # don't!  it would cause AC_CHECK_FUNC to succeed next time configure is run
         AC_DEFINE(HAVE_CONNECT,1,[Whether the system has connect()])
     fi
 fi
-SMB_EXT_LIB(SOCKET,[${SOCKET_LIBS}],[${SOCKET_CFLAGS}],[${SOCKET_CPPFLAGS}],[${SOCKET_LDFLAGS}])
 
 ############################################
 # check for unix domain sockets

Modified: branches/SAMBA_4_0/source/lib/socket/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/socket/config.mk	2005-09-27 10:31:57 UTC (rev 10530)
+++ branches/SAMBA_4_0/source/lib/socket/config.mk	2005-09-27 10:32:49 UTC (rev 10531)
@@ -6,7 +6,6 @@
 INIT_OBJ_FILES = \
 		lib/socket/socket_ipv4.o
 NOPROTO=YES
-REQUIRED_SUBSYSTEMS = EXT_LIB_SOCKET
 # End MODULE socket_ipv4
 ################################################
 
@@ -17,7 +16,6 @@
 INIT_OBJ_FILES = \
 		lib/socket/socket_ipv6.o
 NOPROTO=YES
-REQUIRED_SUBSYSTEMS = EXT_LIB_SOCKET
 # End MODULE socket_ipv6
 ################################################
 
@@ -28,7 +26,6 @@
 INIT_OBJ_FILES = \
 		lib/socket/socket_unix.o
 NOPROTO=YES
-REQUIRED_SUBSYSTEMS = EXT_LIB_SOCKET
 # End MODULE socket_unix
 ################################################