Author: metze Date: 2006-01-13 17:32:43 +0000 (Fri, 13 Jan 2006) New Revision: 12911
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12911 Log: try to fix bug #3365 metze Modified: 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/lib/socket/config.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/socket/config.m4 2006-01-13 17:07:28 UTC (rev 12910) +++ branches/SAMBA_4_0/source/lib/socket/config.m4 2006-01-13 17:32:43 UTC (rev 12911) @@ -18,18 +18,23 @@ # it. AC_CHECK_FUNCS(connect) if test x"$ac_cv_func_connect" = x"no"; then - AC_CHECK_LIB(nsl_s, printf) - AC_CHECK_LIB(nsl, printf) - AC_CHECK_LIB(socket, connect) - AC_CHECK_LIB_EXT(inet, connect) + AC_CHECK_LIB(nsl_s, SOCKET_LIBS, printf) + AC_CHECK_LIB(nsl, SOCKET_LIBS, printf) + AC_CHECK_LIB(socket, SOCKET_LIBS, connect) + AC_CHECK_LIB(inet, SOCKET_LIBS, connect) + SMB_EXT_LIB_ENABLE(SOCKET,YES) 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_DEFINE(HAVE_CONNECT,1,[Whether the system has connect()]) + else + AC_MSG_ERROR([no connect() function available!]) fi fi +SMB_EXT_LIB(SOCKET,[${SOCKET_LIBS}],[${SOCKET_CFLAGS}],[${SOCKET_CPPFLAGS}],[${SOCKET_LDFLAGS}]) + ############################################ # 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-01-13 17:07:28 UTC (rev 12910) +++ branches/SAMBA_4_0/source/lib/socket/config.mk 2006-01-13 17:32:43 UTC (rev 12911) @@ -7,6 +7,7 @@ OBJ_FILES = \ socket_ipv4.o NOPROTO=YES +REQUIRED_SUBSYSTEMS = EXT_LIB_SOCKET # End MODULE socket_ipv4 ################################################ @@ -18,6 +19,7 @@ OBJ_FILES = \ socket_ipv6.o NOPROTO=YES +REQUIRED_SUBSYSTEMS = EXT_LIB_SOCKET # End MODULE socket_ipv6 ################################################ @@ -29,6 +31,7 @@ OBJ_FILES = \ socket_unix.o NOPROTO=YES +REQUIRED_SUBSYSTEMS = EXT_LIB_SOCKET # End MODULE socket_unix ################################################
