summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-08-05 11:56:02 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:31:18 -0500
commit0e6369f5e80d506d532e0e352b02d7d65d16db49 (patch)
tree97f48376cc6bd6ac62f99f933b1d3b7700137a0f
parent0bbe88c8598505f2166cfa8869117e9d02ebfa85 (diff)
downloadsamba-0e6369f5e80d506d532e0e352b02d7d65d16db49.tar.gz
samba-0e6369f5e80d506d532e0e352b02d7d65d16db49.tar.bz2
samba-0e6369f5e80d506d532e0e352b02d7d65d16db49.zip
r9111: actually use the roken inet_aton when nothing was found
metze (This used to be commit fe5e61a25278d9e74158afd0e3b2bd31f71e43c8)
-rw-r--r--source4/heimdal_build/config.m46
-rw-r--r--source4/heimdal_build/config.mk7
2 files changed, 13 insertions, 0 deletions
diff --git a/source4/heimdal_build/config.m4 b/source4/heimdal_build/config.m4
index 583278e3e1..5eb443cd82 100644
--- 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 25c872872d..0eb8316d1a 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -267,6 +267,12 @@ 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]
ADD_OBJ_FILES = \
@@ -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