From f1c138390b38a15e4190b0d5024a1300941e5617 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 29 May 2007 11:03:07 +0000
Subject: r23187: revert 23145 and 23135 to fix the build on solaris...

metze
(This used to be commit cd012361d27ede945308bd5c75916ad967bae006)
---
 source4/heimdal_build/config.m4 | 14 ++++++++++++++
 source4/heimdal_build/config.mk |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'source4')

diff --git a/source4/heimdal_build/config.m4 b/source4/heimdal_build/config.m4
index 6be88ee91d..462521d6b6 100644
--- a/source4/heimdal_build/config.m4
+++ b/source4/heimdal_build/config.m4
@@ -70,7 +70,9 @@ AC_CHECK_FUNCS([				\
 	atexit					\
 	cgetent					\
 	getprogname				\
+	inet_ntop				\
 	inet_aton				\
+	inet_pton				\
 	gethostname				\
 	getnameinfo				\
 	iruserok				\
@@ -239,6 +241,18 @@ if test t$ac_cv_func_inet_aton != tyes; then
 	SMB_ENABLE(HEIMDAL_ROKEN_INET_ATON, YES)
 fi
 
+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!])
+    fi
+fi
+
+SMB_EXT_LIB(NSL,[${NSL_LIBS}],[],[],[])
+
 # only add closefrom if needed
 SMB_ENABLE(HEIMDAL_ROKEN_CLOSEFROM, NO)
 if test t$ac_cv_func_closefrom != tyes; then
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index deed290d8d..39722d8cf2 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -439,9 +439,9 @@ PUBLIC_DEPENDENCIES = \
 			HEIMDAL_ROKEN_GETPROGNAME \
 			HEIMDAL_ROKEN_CLOSEFROM \
 			GAI \
+			NSL \
 			RESOLV \
-			EXT_SOCKET \
-			EXT_NSL
+			EXT_SOCKET
 # End SUBSYSTEM HEIMDAL_ROKEN
 #######################
 
-- 
cgit