summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-05-08 09:59:16 +0200
committerStefan Metzmacher <metze@samba.org>2008-05-13 09:07:11 +0200
commitb6b96be0c21a0efc19962b2a0b6610835aa3f93d (patch)
treefcd629b285d01208dc83294dbea3da488316eab6 /source4
parent41eaffe653b244e0fb66d16bad0899c5f51aa9e4 (diff)
downloadsamba-b6b96be0c21a0efc19962b2a0b6610835aa3f93d.tar.gz
samba-b6b96be0c21a0efc19962b2a0b6610835aa3f93d.tar.bz2
samba-b6b96be0c21a0efc19962b2a0b6610835aa3f93d.zip
libreplace: merge inet_aton.m4 into libreplace_network.m4
metze (This used to be commit fba00736c870f449c0eee32fe0d7b0d539dca51f)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/replace/inet_aton.m41
-rw-r--r--source4/lib/replace/libreplace_network.m43
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/replace/inet_aton.m4 b/source4/lib/replace/inet_aton.m4
deleted file mode 100644
index 853688ef6b..0000000000
--- a/source4/lib/replace/inet_aton.m4
+++ /dev/null
@@ -1 +0,0 @@
-AC_CHECK_FUNCS(inet_aton,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} inet_aton.o"])
diff --git a/source4/lib/replace/libreplace_network.m4 b/source4/lib/replace/libreplace_network.m4
index 35aa3ede7c..66c8192a1e 100644
--- a/source4/lib/replace/libreplace_network.m4
+++ b/source4/lib/replace/libreplace_network.m4
@@ -118,9 +118,10 @@ if test x"$libreplace_cv_REPLACE_INET_NTOA" = x"yes"; then
AC_DEFINE(REPLACE_INET_NTOA,1,[Whether inet_ntoa should be replaced])
fi
+AC_CHECK_FUNCS(inet_aton,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} inet_aton.o"])
+
m4_include(inet_ntop.m4)
m4_include(inet_pton.m4)
-m4_include(inet_aton.m4)
m4_include(getaddrinfo.m4)
m4_include(getifaddrs.m4)
m4_include(socketpair.m4)