libreplace: merge socketpair.m4 into libreplace_network.m4

metze
(cherry picked from commit f9f8f93adcc7161ebb18f5a0bf28c73d951a15ad)

diff --git a/source/lib/replace/libreplace_network.m4 b/source/lib/replace/libreplace_network.m4
index 25ededb027965bcca2a7f976c25c26b2c529bd3b..87f6153e90599a85bdacdd37598149914b4d3cba 100644 (file)
--- a/source/lib/replace/libreplace_network.m4
+++ b/source/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/source/lib/replace/socketpair.m4 b/source/lib/replace/socketpair.m4
deleted file mode 100644 (file)
index 7088334..0000000
--- a/source/lib/replace/socketpair.m4
+++ /dev/null
@@ -1 +0,0 @@
-AC_CHECK_FUNCS(socketpair,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} socketpair.o"])