r23187: revert 23145 and 23135 to fix the build on solaris...

metze

diff --git a/source/heimdal_build/config.m4 b/source/heimdal_build/config.m4
index 6be88ee91d3b61a5f0fea3f845ae618184e63e52..462521d6b6184dcd9df79a68539ef5454d0ca6cc 100644 (file)
--- a/source/heimdal_build/config.m4
+++ b/source/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/source/heimdal_build/config.mk b/source/heimdal_build/config.mk
index deed290d8db5383af97344a133e83dc1e1cc8a33..39722d8cf2bfa93071206c6ab6efeb04c8299d81 100644 (file)
--- a/source/heimdal_build/config.mk
+++ b/source/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
 #######################