diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-05-08 09:59:16 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-05-16 08:51:49 +0200 |
| commit | d1bfe04230cf3b976e59e1a798f55f653c89d293 (patch) | |
| tree | 9d01a79ab657ff61775a413821717b2a1ab23cab | |
| parent | cf7bdeaa2d639ff1dc19de6206a0e89947cb92be (diff) | |
| download | samba-d1bfe04230cf3b976e59e1a798f55f653c89d293.tar.gz samba-d1bfe04230cf3b976e59e1a798f55f653c89d293.tar.bz2 samba-d1bfe04230cf3b976e59e1a798f55f653c89d293.zip | |
libreplace: merge inet_aton.m4 into libreplace_network.m4
metze
(cherry picked from commit fba00736c870f449c0eee32fe0d7b0d539dca51f)
(This used to be commit 7669daa9f536b73a0b933a3d3fcac68c1771dc15)
| -rw-r--r-- | source3/lib/replace/inet_aton.m4 | 1 | ||||
| -rw-r--r-- | source3/lib/replace/libreplace_network.m4 | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/replace/inet_aton.m4 b/source3/lib/replace/inet_aton.m4 deleted file mode 100644 index 853688ef6b..0000000000 --- a/source3/lib/replace/inet_aton.m4 +++ /dev/null @@ -1 +0,0 @@ -AC_CHECK_FUNCS(inet_aton,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} inet_aton.o"]) diff --git a/source3/lib/replace/libreplace_network.m4 b/source3/lib/replace/libreplace_network.m4 index 35aa3ede7c..66c8192a1e 100644 --- a/source3/lib/replace/libreplace_network.m4 +++ b/source3/lib/replace/libreplace_network.m4 @@ -118,9 +118,10 @@ if test x"$libreplace_cv_REPLACE_INET_NTOA" = x"yes"; then AC_DEFINE(REPLACE_INET_NTOA,1,[Whether inet_ntoa should be replaced]) fi +AC_CHECK_FUNCS(inet_aton,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} inet_aton.o"]) + m4_include(inet_ntop.m4) m4_include(inet_pton.m4) -m4_include(inet_aton.m4) m4_include(getaddrinfo.m4) m4_include(getifaddrs.m4) m4_include(socketpair.m4) |