diff options
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/netif/config.m4 | 42 | ||||
| -rw-r--r-- | source4/lib/replace/config.m4 | 16 | ||||
| -rw-r--r-- | source4/lib/socket/config.m4 | 90 | ||||
| -rw-r--r-- | source4/lib/socket/config.mk | 3 |
4 files changed, 150 insertions, 1 deletions
diff --git a/source4/lib/netif/config.m4 b/source4/lib/netif/config.m4 new file mode 100644 index 0000000000..76d1bfa9d5 --- /dev/null +++ b/source4/lib/netif/config.m4 @@ -0,0 +1,42 @@ +AC_CHECK_HEADERS(arpa/inet.h net/if.h netdb.h netinet/in.h) +AC_CHECK_HEADERS(netinet/ip.h netinet/tcp.h netinet/in_systm.h netinet/in_ip.h) + +################## +# look for a method of finding the list of network interfaces +iface=no; +AC_CACHE_CHECK([for iface AIX],samba_cv_HAVE_IFACE_AIX,[ +AC_TRY_RUN([ +#define HAVE_IFACE_AIX 1 +#define AUTOCONF_TEST 1 +#include "confdefs.h" +#include "${srcdir-.}/lib/netif/netif.c"], + samba_cv_HAVE_IFACE_AIX=yes,samba_cv_HAVE_IFACE_AIX=no,samba_cv_HAVE_IFACE_AIX=cross)]) +if test x"$samba_cv_HAVE_IFACE_AIX" = x"yes"; then + iface=yes;AC_DEFINE(HAVE_IFACE_AIX,1,[Whether iface AIX is available]) +fi + +if test $iface = no; then +AC_CACHE_CHECK([for iface ifconf],samba_cv_HAVE_IFACE_IFCONF,[ +AC_TRY_RUN([ +#define HAVE_IFACE_IFCONF 1 +#define AUTOCONF_TEST 1 +#include "confdefs.h" +#include "${srcdir-.}/lib/netif/netif.c"], + samba_cv_HAVE_IFACE_IFCONF=yes,samba_cv_HAVE_IFACE_IFCONF=no,samba_cv_HAVE_IFACE_IFCONF=cross)]) +if test x"$samba_cv_HAVE_IFACE_IFCONF" = x"yes"; then + iface=yes;AC_DEFINE(HAVE_IFACE_IFCONF,1,[Whether iface ifconf is available]) +fi +fi + +if test $iface = no; then +AC_CACHE_CHECK([for iface ifreq],samba_cv_HAVE_IFACE_IFREQ,[ +AC_TRY_RUN([ +#define HAVE_IFACE_IFREQ 1 +#define AUTOCONF_TEST 1 +#include "confdefs.h" +#include "${srcdir-.}/lib/netif/netif.c"], + samba_cv_HAVE_IFACE_IFREQ=yes,samba_cv_HAVE_IFACE_IFREQ=no,samba_cv_HAVE_IFACE_IFREQ=cross)]) +if test x"$samba_cv_HAVE_IFACE_IFREQ" = x"yes"; then + iface=yes;AC_DEFINE(HAVE_IFACE_IFREQ,1,[Whether iface ifreq is available]) +fi +fi diff --git a/source4/lib/replace/config.m4 b/source4/lib/replace/config.m4 new file mode 100644 index 0000000000..8c85663d3b --- /dev/null +++ b/source4/lib/replace/config.m4 @@ -0,0 +1,16 @@ +AC_CACHE_CHECK([for broken inet_ntoa],samba_cv_REPLACE_INET_NTOA,[ +AC_TRY_RUN([ +#include <stdio.h> +#include <sys/types.h> +#include <netinet/in.h> +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif +main() { struct in_addr ip; ip.s_addr = 0x12345678; +if (strcmp(inet_ntoa(ip),"18.52.86.120") && + strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(0); } +exit(1);}], + samba_cv_REPLACE_INET_NTOA=yes,samba_cv_REPLACE_INET_NTOA=no,samba_cv_REPLACE_INET_NTOA=cross)]) +if test x"$samba_cv_REPLACE_INET_NTOA" = x"yes"; then + AC_DEFINE(REPLACE_INET_NTOA,1,[Whether inet_ntoa should be replaced]) +fi diff --git a/source4/lib/socket/config.m4 b/source4/lib/socket/config.m4 index b301c6060c..786d6c72bc 100644 --- a/source4/lib/socket/config.m4 +++ b/source4/lib/socket/config.m4 @@ -1,3 +1,92 @@ +AC_CHECK_HEADERS(sys/socket.h sys/sockio.h sys/un.h) + +AC_CACHE_CHECK([for socklen_t type],samba_cv_socklen_t, [ + AC_TRY_COMPILE([ +#include <sys/types.h> +#if STDC_HEADERS +#include <stdlib.h> +#include <stddef.h> +#endif +#include <sys/socket.h>],[socklen_t i = 0], + samba_cv_socklen_t=yes,samba_cv_socklen_t=no)]) +if test x"$samba_cv_socklen_t" = x"yes"; then + AC_DEFINE(HAVE_SOCKLEN_T_TYPE,1,[Whether we have the variable type socklen_t]) +fi + +AC_CACHE_CHECK([for sin_len in sock],samba_cv_HAVE_SOCK_SIN_LEN,[ +AC_TRY_COMPILE([#include <sys/types.h> +#include <sys/socket.h> +#include <netinet/in.h>], +[struct sockaddr_in sock; sock.sin_len = sizeof(sock);], +samba_cv_HAVE_SOCK_SIN_LEN=yes,samba_cv_HAVE_SOCK_SIN_LEN=no)]) +if test x"$samba_cv_HAVE_SOCK_SIN_LEN" = x"yes"; then + AC_DEFINE(HAVE_SOCK_SIN_LEN,1,[Whether the sockaddr_in struct has a sin_len property]) +fi + +# The following test taken from the cvs sources +# If we can't find connect, try looking in -lsocket, -lnsl, and -linet. +# The Irix 5 libc.so has connect and gethostbyname, but Irix 5 also has +# libsocket.so which has a bad implementation of gethostbyname (it +# only looks in /etc/hosts), so we only look for -lsocket if we need +# 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 + 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 +AC_CACHE_CHECK([for unix domain sockets],samba_cv_unixsocket, [ + AC_TRY_COMPILE([ +#include <sys/types.h> +#include <stdlib.h> +#include <stddef.h> +#include <sys/socket.h> +#include <sys/un.h>], +[ + struct sockaddr_un sunaddr; + sunaddr.sun_family = AF_UNIX; +], + samba_cv_unixsocket=yes,samba_cv_unixsocket=no)]) +SMB_MODULE_DEFAULT(socket_unix, NOT) +if test x"$samba_cv_unixsocket" = x"yes"; then + SMB_MODULE_DEFAULT(socket_unix, STATIC) + AC_DEFINE(HAVE_UNIXSOCKET,1,[If we need to build with unixscoket support]) +fi + +AC_CACHE_CHECK([for AF_LOCAL socket support], samba_cv_HAVE_WORKING_AF_LOCAL, [ +AC_TRY_RUN([#include "${srcdir-.}/build/tests/unixsock.c"], + samba_cv_HAVE_WORKING_AF_LOCAL=yes, + samba_cv_HAVE_WORKING_AF_LOCAL=no, + samba_cv_HAVE_WORKING_AF_LOCAL=cross)]) +if test x"$samba_cv_HAVE_WORKING_AF_LOCAL" != xno +then + AC_DEFINE(HAVE_WORKING_AF_LOCAL, 1, [Define if you have working AF_LOCAL sockets]) +fi dnl test for ipv6 using the gethostbyname2() function. That should be sufficient dnl for now @@ -7,6 +96,5 @@ if $have_ipv6 = true; then SMB_MODULE_DEFAULT(socket_ipv6, STATIC) AC_DEFINE(HAVE_SOCKET_IPV6,1,[Whether the system has ipv6 support]) fi - dnl don't build ipv6 by default, unless the above test enables it, or dnl the configure uses --with-static-modules=socket_ipv6 diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk index 13fe584373..e007b01725 100644 --- a/source4/lib/socket/config.mk +++ b/source4/lib/socket/config.mk @@ -6,6 +6,7 @@ SUBSYSTEM = SOCKET INIT_OBJ_FILES = \ lib/socket/socket_ipv4.o NOPROTO=YES +REQUIRED_SUBSYSTEMS = EXT_LIB_SOCKET # End MODULE socket_ipv4 ################################################ @@ -16,6 +17,7 @@ SUBSYSTEM = SOCKET INIT_OBJ_FILES = \ lib/socket/socket_ipv6.o NOPROTO=YES +REQUIRED_SUBSYSTEMS = EXT_LIB_SOCKET # End MODULE socket_ipv6 ################################################ @@ -26,6 +28,7 @@ SUBSYSTEM = SOCKET INIT_OBJ_FILES = \ lib/socket/socket_unix.o NOPROTO=YES +REQUIRED_SUBSYSTEMS = EXT_LIB_SOCKET # End MODULE socket_unix ################################################ |