diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-10-05 23:54:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:07:51 -0500 |
| commit | e511090a4339221dfd1fa597964af7455f96ec28 (patch) | |
| tree | 642564ee8fc2222bea72eecf632cac09afd34be0 /source4/heimdal_build/config.mk | |
| parent | f0bc19ae47d7f06d111713b0dbb00f387621e675 (diff) | |
| download | samba-e511090a4339221dfd1fa597964af7455f96ec28.tar.gz samba-e511090a4339221dfd1fa597964af7455f96ec28.tar.bz2 samba-e511090a4339221dfd1fa597964af7455f96ec28.zip | |
r25543: Merge libreplace support for inet_pton, inet_ntop, getaddrinfo, getnameinfo
(and friends) from SAMBA_3_2, with some minor tweaks:
- avoid including network headers in replace.h unless absolutely required
- autoconf tests for getaddrinfo() in lib/replace
The heimdal-specific code also no longer looks for these functions anymore.
(This used to be commit b6d3fd84a5d7d814035e60d6fa22f19bed9f77da)
Diffstat (limited to 'source4/heimdal_build/config.mk')
| -rw-r--r-- | source4/heimdal_build/config.mk | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk index 940d9cdb9c..ce5fa6e98e 100644 --- a/source4/heimdal_build/config.mk +++ b/source4/heimdal_build/config.mk @@ -369,24 +369,6 @@ OBJ_FILES = \ # End SUBSYSTEM HEIMDAL_HX509 ####################### -####################### -# Start SUBSYSTEM HEIMDAL_ROKEN_GAI_STRERROR -[SUBSYSTEM::HEIMDAL_ROKEN_GAI_STRERROR] -CFLAGS = -Iheimdal_build -Iheimdal/lib/roken -Ilib/socket_wrapper -OBJ_FILES = ../heimdal/lib/roken/gai_strerror.o - -[SUBSYSTEM::HEIMDAL_ROKEN_INET_ATON] -CFLAGS = -Iheimdal_build -Iheimdal/lib/roken -Ilib/socket_wrapper -OBJ_FILES = ../heimdal/lib/roken/inet_aton.o - -[SUBSYSTEM::HEIMDAL_ROKEN_INET_NTOP] -CFLAGS = -Iheimdal_build -Iheimdal/lib/roken -Ilib/socket_wrapper -OBJ_FILES = ../heimdal/lib/roken/inet_ntop.o - -[SUBSYSTEM::HEIMDAL_ROKEN_INET_PTON] -CFLAGS = -Iheimdal_build -Iheimdal/lib/roken -Ilib/socket_wrapper -OBJ_FILES = ../heimdal/lib/roken/inet_pton.o - [SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME] CFLAGS = -Iheimdal_build -Iheimdal/lib/roken -Ilib/socket_wrapper OBJ_FILES = ../heimdal/lib/roken/getprogname.o @@ -399,24 +381,6 @@ OBJ_FILES = ../heimdal/lib/roken/closefrom.o CFLAGS = -Iheimdal_build -Iheimdal/lib/roken -Ilib/socket_wrapper OBJ_FILES = ../heimdal/lib/roken/getprogname.ho -[SUBSYSTEM::HEIMDAL_ROKEN_GETNAMEINFO] -CFLAGS = -Iheimdal_build -Iheimdal/lib/roken -Ilib/socket_wrapper -OBJ_FILES = ../heimdal/lib/roken/getnameinfo.o - -####################### -# Start SUBSYSTEM HEIMDAL_ROKEN_ADDRINFO -[SUBSYSTEM::HEIMDAL_ROKEN_ADDRINFO] -CFLAGS = -Iheimdal_build -Iheimdal/lib/roken -OBJ_FILES = \ - ../heimdal/lib/roken/getaddrinfo.o \ - ../heimdal/lib/roken/freeaddrinfo.o \ - ../heimdal/lib/roken/getipnodebyaddr.o \ - ../heimdal/lib/roken/getipnodebyname.o \ - ../heimdal/lib/roken/freehostent.o \ - ../heimdal/lib/roken/copyhostent.o \ - ../heimdal/lib/roken/hostent_find_fqdn.o -PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN_INET_PTON EXT_SOCKET - ####################### # Start SUBSYSTEM HEIMDAL_ROKEN [SUBSYSTEM::HEIMDAL_ROKEN] @@ -453,16 +417,8 @@ OBJ_FILES = \ ../heimdal/lib/roken/rtbl.o \ replace.o PUBLIC_DEPENDENCIES = \ - HEIMDAL_ROKEN_ADDRINFO \ - HEIMDAL_ROKEN_GAI_STRERROR \ - HEIMDAL_ROKEN_INET_ATON \ - HEIMDAL_ROKEN_INET_NTOP \ - HEIMDAL_ROKEN_INET_PTON \ HEIMDAL_ROKEN_GETPROGNAME \ HEIMDAL_ROKEN_CLOSEFROM \ - HEIMDAL_ROKEN_GETNAMEINFO \ - GAI \ - NSL \ RESOLV \ EXT_SOCKET # End SUBSYSTEM HEIMDAL_ROKEN |