From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 8 May 2008 08:02:21 +0000 (+0200)
Subject: libreplace: merge inet_pton.m4 into libreplace_network.m4
X-Git-Tag: samba-4.0.0alpha6~801^2~1342
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d364bdb3004531a33f6bc71f8d4dddf33a3699dc;p=thirdparty%2Fsamba.git

libreplace: merge inet_pton.m4 into libreplace_network.m4

metze
(cherry picked from commit 3a70274c908e31453942b442351eab8423c1a53d)
(This used to be commit b078ae2b56c9a932655ef619a7af5ce0aeb904dd)
---

diff --git a/source3/lib/replace/inet_pton.m4 b/source3/lib/replace/inet_pton.m4
deleted file mode 100644
index 51de9275d06..00000000000
--- a/source3/lib/replace/inet_pton.m4
+++ /dev/null
@@ -1 +0,0 @@
-AC_CHECK_FUNCS(inet_pton,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} inet_pton.o"])
diff --git a/source3/lib/replace/libreplace_network.m4 b/source3/lib/replace/libreplace_network.m4
index 7ee7519e7ea..25ededb0279 100644
--- a/source3/lib/replace/libreplace_network.m4
+++ b/source3/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)