summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-05-08 10:00:58 +0200
committerStefan Metzmacher <metze@samba.org>2008-05-16 08:51:49 +0200
commit09b0cd0e1f9bbfe8cb6eb8fdba2f11b3d77e3970 (patch)
treee359d9c51a634f7b9f7eb5207f43978060ef39f7
parentd1bfe04230cf3b976e59e1a798f55f653c89d293 (diff)
downloadsamba-09b0cd0e1f9bbfe8cb6eb8fdba2f11b3d77e3970.tar.gz
samba-09b0cd0e1f9bbfe8cb6eb8fdba2f11b3d77e3970.tar.bz2
samba-09b0cd0e1f9bbfe8cb6eb8fdba2f11b3d77e3970.zip
libreplace: merge inet_ntop.m4 into libreplace_network.m4
metze (cherry picked from commit 223ef6c08efb52251d0a772bb0c481b2803cf0ce) (This used to be commit 438ddd9c81e74e3042154cf5f0416043ee6a8c35)
-rw-r--r--source3/lib/replace/inet_ntop.m41
-rw-r--r--source3/lib/replace/libreplace_network.m43
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/replace/inet_ntop.m4 b/source3/lib/replace/inet_ntop.m4
deleted file mode 100644
index 6f39056f1d..0000000000
--- a/source3/lib/replace/inet_ntop.m4
+++ /dev/null
@@ -1 +0,0 @@
-AC_CHECK_FUNCS(inet_ntop,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} inet_ntop.o"])
diff --git a/source3/lib/replace/libreplace_network.m4 b/source3/lib/replace/libreplace_network.m4
index 66c8192a1e..7ee7519e7e 100644
--- a/source3/lib/replace/libreplace_network.m4
+++ b/source3/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)