From 4690d5c5531fe2f68eb2dfb75874fb6a110031a7 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 29 May 2007 15:19:37 +0000
Subject: r23209: import getnameinfo.c, inet_ntop.c and inet_pton.c from
 loikeet-heimdal

metze
(This used to be commit 48eb20199e7a01f4ab7f5194a5256ad7dd03ad86)
---
 source4/heimdal_build/config.m4 | 25 ++++++++++++++++++++++---
 source4/heimdal_build/config.mk | 17 ++++++++++++++++-
 2 files changed, 38 insertions(+), 4 deletions(-)

(limited to 'source4/heimdal_build')

diff --git a/source4/heimdal_build/config.m4 b/source4/heimdal_build/config.m4
index 462521d6b6..01a620c1c5 100644
--- a/source4/heimdal_build/config.m4
+++ b/source4/heimdal_build/config.m4
@@ -70,8 +70,8 @@ AC_CHECK_FUNCS([				\
 	atexit					\
 	cgetent					\
 	getprogname				\
-	inet_ntop				\
 	inet_aton				\
+	inet_ntop				\
 	inet_pton				\
 	gethostname				\
 	getnameinfo				\
@@ -235,19 +235,38 @@ if test t$ac_cv_func_getaddrinfo != tyes; then
 	SMB_ENABLE(HEIMDAL_ROKEN_ADDRINFO, YES)
 fi
 
+SMB_ENABLE(HEIMDAL_ROKEN_GETNAMEINFO, NO)
+if test t$ac_cv_func_getnameinfo != tyes; then
+	SMB_ENABLE(HEIMDAL_ROKEN_GETNAMEINFO, YES)
+fi
+
 # only add inet_aton if needed
 SMB_ENABLE(HEIMDAL_ROKEN_INET_ATON, NO)
 if test t$ac_cv_func_inet_aton != tyes; then
 	SMB_ENABLE(HEIMDAL_ROKEN_INET_ATON, YES)
 fi
 
+SMB_ENABLE(HEIMDAL_ROKEN_INET_NTOP, NO)
+if test x"$ac_cv_func_inet_ntop" = x"no"; then
+    AC_CHECK_LIB_EXT(nsl_s, NSL_LIBS, inet_ntop)
+    AC_CHECK_LIB_EXT(nsl, NSL_LIBS, inet_ntop)
+    if test x"$ac_cv_lib_ext_nsl_s_inet_ntop" != x"yes" &&
+       test x"$ac_cv_lib_ext_nsl_inet_ntop" != x"yes"; then
+	SMB_ENABLE(HEIMDAL_ROKEN_INET_NTOP, YES)
+    else
+	SMB_ENABLE(NSL,YES)
+    fi
+fi
+
+SMB_ENABLE(HEIMDAL_ROKEN_INET_PTON, NO)
 if test x"$ac_cv_func_inet_pton" = x"no"; then
     AC_CHECK_LIB_EXT(nsl_s, NSL_LIBS, inet_pton)
     AC_CHECK_LIB_EXT(nsl, NSL_LIBS, inet_pton)
-    SMB_ENABLE(NSL,YES)
     if test x"$ac_cv_lib_ext_nsl_s_inet_pton" != x"yes" &&
        test x"$ac_cv_lib_ext_nsl_inet_pton" != x"yes"; then
-	AC_MSG_ERROR([no inet_pton() function available!])
+	SMB_ENABLE(HEIMDAL_ROKEN_INET_PTON, YES)
+    else
+	SMB_ENABLE(NSL,YES)
     fi
 fi
 
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index 39722d8cf2..93152fc868 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -373,6 +373,14 @@ OBJ_FILES = ../heimdal/lib/roken/gai_strerror.o
 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
@@ -385,6 +393,10 @@ 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]
@@ -397,7 +409,7 @@ OBJ_FILES = \
 	../heimdal/lib/roken/freehostent.o \
 	../heimdal/lib/roken/copyhostent.o \
 	../heimdal/lib/roken/hostent_find_fqdn.o
-PRIVATE_DEPENDENCIES = EXT_SOCKET
+PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN_INET_PTON EXT_SOCKET
 
 #######################
 # Start SUBSYSTEM HEIMDAL_ROKEN
@@ -436,8 +448,11 @@ 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 \
-- 
cgit