svn commit: samba r15265 - in branches/SAMBA_4_0/source/heimdal_build: .

[jelmer at samba.org]

Author: jelmer
Date: 2006-04-26 08:29:53 +0000 (Wed, 26 Apr 2006)
New Revision: 15265

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15265

Log:
Try to find inet_pton in -lnsl (should fix linking on sun1)

Modified:
   branches/SAMBA_4_0/source/heimdal_build/config.m4
   branches/SAMBA_4_0/source/heimdal_build/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/config.m4
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/config.m4	2006-04-26 07:20:20 UTC (rev 15264)
+++ branches/SAMBA_4_0/source/heimdal_build/config.m4	2006-04-26 08:29:53 UTC (rev 15265)
@@ -65,6 +65,7 @@
 	getprogname				\
 	inet_ntop				\
 	inet_aton				\
+	inet_pton				\
 	gethostname				\
 	getnameinfo				\
 	iruserok				\
@@ -236,6 +237,18 @@
 	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_EXT_LIB_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 getprogname if needed
 SMB_ENABLE(HEIMDAL_ROKEN_GETPROGNAME, NO)
 SMB_ENABLE(HEIMDAL_ROKEN_GETPROGNAME_HOST, NO)

Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/config.mk	2006-04-26 07:20:20 UTC (rev 15264)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk	2006-04-26 08:29:53 UTC (rev 15265)
@@ -349,7 +349,8 @@
 			HEIMDAL_ROKEN_GAI_STRERROR \
 			HEIMDAL_ROKEN_INET_ATON \
 			HEIMDAL_ROKEN_GETPROGNAME \
-			EXT_LIB_GAI
+			EXT_LIB_GAI \
+			EXT_LIB_NSL
 # End SUBSYSTEM HEIMDAL_ROKEN
 #######################