summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-05-08 10:00:58 +0200
committerStefan Metzmacher <metze@samba.org>2008-05-13 09:07:11 +0200
commit8408101e248587f9f3614fb4f9a644bfdf7abd49 (patch)
tree807dd58fe7026d61f689df3da62392689cdc1ed0 /source4
parentb6b96be0c21a0efc19962b2a0b6610835aa3f93d (diff)
downloadsamba-8408101e248587f9f3614fb4f9a644bfdf7abd49.tar.gz
samba-8408101e248587f9f3614fb4f9a644bfdf7abd49.tar.bz2
samba-8408101e248587f9f3614fb4f9a644bfdf7abd49.zip
libreplace: merge inet_ntop.m4 into libreplace_network.m4
metze (This used to be commit 223ef6c08efb52251d0a772bb0c481b2803cf0ce)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/replace/inet_ntop.m41
-rw-r--r--source4/lib/replace/libreplace_network.m43
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/replace/inet_ntop.m4 b/source4/lib/replace/inet_ntop.m4
deleted file mode 100644
index 6f39056f1d..0000000000
--- a/source4/lib/replace/inet_ntop.m4
+++ /dev/null
@@ -1 +0,0 @@
-AC_CHECK_FUNCS(inet_ntop,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} inet_ntop.o"])
diff --git a/source4/lib/replace/libreplace_network.m4 b/source4/lib/replace/libreplace_network.m4
index 66c8192a1e..7ee7519e7e 100644
--- a/source4/lib/replace/libreplace_network.m4
+++ b/source4/lib/replace/libreplace_network.m4
@@ -120,7 +120,8 @@ fi
AC_CHECK_FUNCS(inet_aton,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} inet_aton.o"])
-m4_include(inet_ntop.m4)
+AC_CHECK_FUNCS(inet_ntop,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} inet_ntop.o"])
+
m4_include(inet_pton.m4)
m4_include(getaddrinfo.m4)
m4_include(getifaddrs.m4)