summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-05-08 10:04:51 +0200
committerStefan Metzmacher <metze@samba.org>2008-05-13 09:07:12 +0200
commit254641d3f21d54927e46304c3fb091909f2c5ba3 (patch)
tree852dafa160d33ab5fb685ccabd156c5fdc520ae4
parent1155c2f457bfc807abf4f798bb5940fc84994dca (diff)
downloadsamba-254641d3f21d54927e46304c3fb091909f2c5ba3.tar.gz
samba-254641d3f21d54927e46304c3fb091909f2c5ba3.tar.bz2
samba-254641d3f21d54927e46304c3fb091909f2c5ba3.zip
libreplace: merge socketpair.m4 into libreplace_network.m4
metze (This used to be commit f9f8f93adcc7161ebb18f5a0bf28c73d951a15ad)
-rw-r--r--source4/lib/replace/libreplace_network.m43
-rw-r--r--source4/lib/replace/socketpair.m41
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/replace/libreplace_network.m4 b/source4/lib/replace/libreplace_network.m4
index 25ededb027..87f6153e90 100644
--- a/source4/lib/replace/libreplace_network.m4
+++ b/source4/lib/replace/libreplace_network.m4
@@ -98,6 +98,8 @@ if test x"$ac_cv_func_gethostbyname" = x"no"; then
fi
fi
+AC_CHECK_FUNCS(socketpair,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} socketpair.o"])
+
AC_CHECK_FUNCS(inet_ntoa,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} inet_ntoa.o"])
AC_CACHE_CHECK([for broken inet_ntoa],libreplace_cv_REPLACE_INET_NTOA,[
@@ -126,7 +128,6 @@ AC_CHECK_FUNCS(inet_pton,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} inet_pton.o"])
m4_include(getaddrinfo.m4)
m4_include(getifaddrs.m4)
-m4_include(socketpair.m4)
echo "LIBREPLACE_NETWORK_CHECKS: END"
]) dnl end AC_LIBREPLACE_NETWORK_CHECKS
diff --git a/source4/lib/replace/socketpair.m4 b/source4/lib/replace/socketpair.m4
deleted file mode 100644
index 7088334cda..0000000000
--- a/source4/lib/replace/socketpair.m4
+++ /dev/null
@@ -1 +0,0 @@
-AC_CHECK_FUNCS(socketpair,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} socketpair.o"])