summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-05-08 10:02:21 +0200
committerStefan Metzmacher <metze@samba.org>2008-05-13 09:07:11 +0200
commit1155c2f457bfc807abf4f798bb5940fc84994dca (patch)
tree0f3c8b7838004089f21a0629511bc74de747b9a9 /source4
parent8408101e248587f9f3614fb4f9a644bfdf7abd49 (diff)
downloadsamba-1155c2f457bfc807abf4f798bb5940fc84994dca.tar.gz
samba-1155c2f457bfc807abf4f798bb5940fc84994dca.tar.bz2
samba-1155c2f457bfc807abf4f798bb5940fc84994dca.zip
libreplace: merge inet_pton.m4 into libreplace_network.m4
metze (This used to be commit 3a70274c908e31453942b442351eab8423c1a53d)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/replace/inet_pton.m41
-rw-r--r--source4/lib/replace/libreplace_network.m43
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/replace/inet_pton.m4 b/source4/lib/replace/inet_pton.m4
deleted file mode 100644
index 51de9275d0..0000000000
--- a/source4/lib/replace/inet_pton.m4
+++ /dev/null
@@ -1 +0,0 @@
-AC_CHECK_FUNCS(inet_pton,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} inet_pton.o"])
diff --git a/source4/lib/replace/libreplace_network.m4 b/source4/lib/replace/libreplace_network.m4
index 7ee7519e7e..25ededb027 100644
--- a/source4/lib/replace/libreplace_network.m4
+++ b/source4/lib/replace/libreplace_network.m4
@@ -122,7 +122,8 @@ AC_CHECK_FUNCS(inet_aton,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} inet_aton.o"])
AC_CHECK_FUNCS(inet_ntop,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} inet_ntop.o"])
-m4_include(inet_pton.m4)
+AC_CHECK_FUNCS(inet_pton,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} inet_pton.o"])
+
m4_include(getaddrinfo.m4)
m4_include(getifaddrs.m4)
m4_include(socketpair.m4)