diff options
| author | Simo Sorce <idra@samba.org> | 2007-12-17 15:26:16 -0500 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2007-12-17 15:26:16 -0500 |
| commit | 2e44c4020b09c197e5835f3f646da6e4d5203af2 (patch) | |
| tree | 495d21635f190e0e2c0c29b7a9ad045c45c5b1a7 /source3/lib | |
| parent | 4869ccfed6ba8c44fb49844a5a8abbb671518954 (diff) | |
| parent | 8f28bda7f8c18de597d345126c9ee03e99776e55 (diff) | |
| download | samba-2e44c4020b09c197e5835f3f646da6e4d5203af2.tar.gz samba-2e44c4020b09c197e5835f3f646da6e4d5203af2.tar.bz2 samba-2e44c4020b09c197e5835f3f646da6e4d5203af2.zip | |
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-simo
(This used to be commit e940537d5be870ae622712a3b76dff891739df8c)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/replace/libreplace.m4 | 1 | ||||
| -rw-r--r-- | source3/lib/replace/system/network.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/source3/lib/replace/libreplace.m4 b/source3/lib/replace/libreplace.m4 index c10a4b2381..7a5283a4d6 100644 --- a/source3/lib/replace/libreplace.m4 +++ b/source3/lib/replace/libreplace.m4 @@ -100,6 +100,7 @@ AC_CHECK_HEADERS(sys/socket.h netinet/in.h netdb.h arpa/inet.h) AC_CHECK_HEADERS(netinet/ip.h netinet/tcp.h netinet/in_systm.h netinet/in_ip.h) AC_CHECK_HEADERS(sys/sockio.h sys/un.h) AC_CHECK_HEADERS(sys/mount.h mntent.h) +AC_CHECK_HEADERS(stropts.h) dnl we need to check that net/if.h really can be used, to cope with hpux dnl where including it always fails diff --git a/source3/lib/replace/system/network.h b/source3/lib/replace/system/network.h index d3ae2bf398..9087c02da1 100644 --- a/source3/lib/replace/system/network.h +++ b/source3/lib/replace/system/network.h @@ -78,6 +78,10 @@ #include <sys/ioctl.h> #endif +#ifdef HAVE_STROPTS_H +#include <stropts.h> +#endif + #ifdef REPLACE_INET_NTOA /* define is in "replace.h" */ char *rep_inet_ntoa(struct in_addr ip); |