diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-05-08 10:04:51 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-05-16 08:51:51 +0200 |
| commit | 3f080815c9ff57eb863b012e6861db4dabb541ee (patch) | |
| tree | c2af34bb6cf1ea3a9c5a1cef77ae9720c2f57ad2 /source3/lib/replace | |
| parent | d364bdb3004531a33f6bc71f8d4dddf33a3699dc (diff) | |
| download | samba-3f080815c9ff57eb863b012e6861db4dabb541ee.tar.gz samba-3f080815c9ff57eb863b012e6861db4dabb541ee.tar.bz2 samba-3f080815c9ff57eb863b012e6861db4dabb541ee.zip | |
libreplace: merge socketpair.m4 into libreplace_network.m4
metze
(cherry picked from commit f9f8f93adcc7161ebb18f5a0bf28c73d951a15ad)
(This used to be commit 9aa0f6626d6a69ceeb8bb4ea71ea3d4a6157d101)
Diffstat (limited to 'source3/lib/replace')
| -rw-r--r-- | source3/lib/replace/libreplace_network.m4 | 3 | ||||
| -rw-r--r-- | source3/lib/replace/socketpair.m4 | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/replace/libreplace_network.m4 b/source3/lib/replace/libreplace_network.m4 index 25ededb027..87f6153e90 100644 --- a/source3/lib/replace/libreplace_network.m4 +++ b/source3/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/source3/lib/replace/socketpair.m4 b/source3/lib/replace/socketpair.m4 deleted file mode 100644 index 7088334cda..0000000000 --- a/source3/lib/replace/socketpair.m4 +++ /dev/null @@ -1 +0,0 @@ -AC_CHECK_FUNCS(socketpair,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} socketpair.o"]) |