diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-05-08 09:58:07 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-05-16 08:51:49 +0200 |
| commit | cf7bdeaa2d639ff1dc19de6206a0e89947cb92be (patch) | |
| tree | c070af8fb1fcd9b63b80a2737facaffc7c90a8bf /source3/lib | |
| parent | b76992d2622c178d28b486f92d27e0162b2e2ac8 (diff) | |
| download | samba-cf7bdeaa2d639ff1dc19de6206a0e89947cb92be.tar.gz samba-cf7bdeaa2d639ff1dc19de6206a0e89947cb92be.tar.bz2 samba-cf7bdeaa2d639ff1dc19de6206a0e89947cb92be.zip | |
libreplace: merge inet_ntoa.m4 into libreplace_network.m4
metze
(cherry picked from commit 82e826253b6d18832931dbb5c1dda009889bf9e0)
(This used to be commit 09632f9694599e626e889e54310383878c51413f)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/replace/inet_ntoa.m4 | 19 | ||||
| -rw-r--r-- | source3/lib/replace/libreplace_network.m4 | 21 |
2 files changed, 20 insertions, 20 deletions
diff --git a/source3/lib/replace/inet_ntoa.m4 b/source3/lib/replace/inet_ntoa.m4 deleted file mode 100644 index 5aaa9350c5..0000000000 --- a/source3/lib/replace/inet_ntoa.m4 +++ /dev/null @@ -1,19 +0,0 @@ -AC_CHECK_FUNCS(inet_ntoa,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} inet_ntoa.o"]) - -AC_CACHE_CHECK([for broken inet_ntoa],libreplace_cv_REPLACE_INET_NTOA,[ -AC_TRY_RUN([ -#include <stdio.h> -#include <unistd.h> -#include <sys/types.h> -#include <netinet/in.h> -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif -main() { struct in_addr ip; ip.s_addr = 0x12345678; -if (strcmp(inet_ntoa(ip),"18.52.86.120") && - strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(0); } -exit(1);}], - libreplace_cv_REPLACE_INET_NTOA=yes,libreplace_cv_REPLACE_INET_NTOA=no,libreplace_cv_REPLACE_INET_NTOA=cross)]) -if test x"$libreplace_cv_REPLACE_INET_NTOA" = x"yes"; then - AC_DEFINE(REPLACE_INET_NTOA,1,[Whether inet_ntoa should be replaced]) -fi diff --git a/source3/lib/replace/libreplace_network.m4 b/source3/lib/replace/libreplace_network.m4 index 209d418be6..35aa3ede7c 100644 --- a/source3/lib/replace/libreplace_network.m4 +++ b/source3/lib/replace/libreplace_network.m4 @@ -98,10 +98,29 @@ if test x"$ac_cv_func_gethostbyname" = x"no"; then fi fi +AC_CHECK_FUNCS(inet_ntoa,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} inet_ntoa.o"]) + +AC_CACHE_CHECK([for broken inet_ntoa],libreplace_cv_REPLACE_INET_NTOA,[ +AC_TRY_RUN([ +#include <stdio.h> +#include <unistd.h> +#include <sys/types.h> +#include <netinet/in.h> +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif +main() { struct in_addr ip; ip.s_addr = 0x12345678; +if (strcmp(inet_ntoa(ip),"18.52.86.120") && + strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(0); } +exit(1);}], + libreplace_cv_REPLACE_INET_NTOA=yes,libreplace_cv_REPLACE_INET_NTOA=no,libreplace_cv_REPLACE_INET_NTOA=cross)]) +if test x"$libreplace_cv_REPLACE_INET_NTOA" = x"yes"; then + AC_DEFINE(REPLACE_INET_NTOA,1,[Whether inet_ntoa should be replaced]) +fi + m4_include(inet_ntop.m4) m4_include(inet_pton.m4) m4_include(inet_aton.m4) -m4_include(inet_ntoa.m4) m4_include(getaddrinfo.m4) m4_include(getifaddrs.m4) m4_include(socketpair.m4) |