r9111: actually use the roken inet_aton when nothing was found

metze
(This used to be commit fe5e61a25278d9e74158afd0e3b2bd31f71e43c8)

diff --git a/source4/heimdal_build/config.m4 b/source4/heimdal_build/config.m4
index 583278e3e11694b02151d69bb739a452e3c9c391..5eb443cd82f4ff391c7c0e90da4f3985c78b0552 100644 (file)
--- a/source4/heimdal_build/config.m4
+++ b/source4/heimdal_build/config.m4
@@ -203,6 +203,12 @@ if test t$ac_cv_func_getaddrinfo != tyes; then
        SMB_SUBSYSTEM_ENABLE(HEIMDAL_ROKEN_ADDRINFO, YES)
 fi
 
+# only add inet_aton if needed
+SMB_SUBSYSTEM_ENABLE(HEIMDAL_ROKEN_INET_ATON, NO)
+if test t$ac_cv_func_inet_aton != tyes; then
+       SMB_SUBSYSTEM_ENABLE(HEIMDAL_ROKEN_INET_ATON, YES)
+fi
+
 # only add gai_strerror if needed
 SMB_SUBSYSTEM_ENABLE(HEIMDAL_ROKEN_GAI_STRERROR, NO)
 AC_CHECK_FUNC(gai_strerror)

diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index 25c872872d1412b976054ebddbb237dad1b8bbe5..0eb8316d1ad38b056a5165f9caab40011d4c547a 100644 (file)
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -266,6 +266,12 @@ NOPROTO = YES
 ADD_OBJ_FILES = heimdal/lib/roken/gai_strerror.o
 NOPROTO = YES
 
+#######################
+# Start SUBSYSTEM HEIMDAL_ROKEN_GAI_STRERROR
+[SUBSYSTEM::HEIMDAL_ROKEN_INET_ATON]
+ADD_OBJ_FILES = heimdal/lib/roken/inet_aton.o
+NOPROTO = YES
+
 #######################
 # Start SUBSYSTEM HEIMDAL_ROKEN_ADDRINFO
 [SUBSYSTEM::HEIMDAL_ROKEN_ADDRINFO]
@@ -305,6 +311,7 @@ ADD_OBJ_FILES = \
 REQUIRED_SUBSYSTEMS = \
                        HEIMDAL_ROKEN_ADDRINFO \
                        HEIMDAL_ROKEN_GAI_STRERROR \
+                       HEIMDAL_ROKEN_INET_ATON \
                        EXT_LIB_SOCKET \
                        EXT_LIB_XNET
 NOPROTO = YES