summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-05-08 10:02:21 +0200
committerStefan Metzmacher <metze@samba.org>2008-05-16 08:51:51 +0200
commitd364bdb3004531a33f6bc71f8d4dddf33a3699dc (patch)
treef73532bca3a0e681754b904245a7e5c9b6907ec5 /source3/lib
parent09b0cd0e1f9bbfe8cb6eb8fdba2f11b3d77e3970 (diff)
downloadsamba-d364bdb3004531a33f6bc71f8d4dddf33a3699dc.tar.gz
samba-d364bdb3004531a33f6bc71f8d4dddf33a3699dc.tar.bz2
samba-d364bdb3004531a33f6bc71f8d4dddf33a3699dc.zip
libreplace: merge inet_pton.m4 into libreplace_network.m4
metze (cherry picked from commit 3a70274c908e31453942b442351eab8423c1a53d) (This used to be commit b078ae2b56c9a932655ef619a7af5ce0aeb904dd)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/replace/inet_pton.m41
-rw-r--r--source3/lib/replace/libreplace_network.m43
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/replace/inet_pton.m4 b/source3/lib/replace/inet_pton.m4
deleted file mode 100644
index 51de9275d0..0000000000
--- 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 7ee7519e7e..25ededb027 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)