diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-12-14 17:08:30 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-12-14 17:08:30 +0100 |
| commit | 1568f5721c78cb69f2d2f0ab9c6585f3f1104f20 (patch) | |
| tree | 81a97d7a00706f8beac7632ccf7478ec465a719a /configure.in | |
| parent | 32b9defd3c7ca206dc314d044607c05b2f2501f5 (diff) | |
| parent | 376cf4275f28f6b8167eaf19b2c66dee41fbc5c5 (diff) | |
| download | mariadb-git-1568f5721c78cb69f2d2f0ab9c6585f3f1104f20.tar.gz | |
Merge
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 42 |
1 files changed, 36 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 468111b8e24..361dd42b831 100644 --- a/configure.in +++ b/configure.in @@ -943,6 +943,42 @@ fi AC_MSG_RESULT($use_alarm) #-------------------------------------------------------------------- +# Check for IPv6 support +#-------------------------------------------------------------------- + +AC_CHECK_HEADERS(netinet/in6.h) + +AC_CHECK_TYPES([struct sockaddr_in6, struct in6_addr], + [have_in6_types=yes], + [have_in6_types=no], + [[ + #ifdef WIN32 + #include <winsock2.h> + #else + #include <sys/types.h> + #include <netinet/in.h> + #include <sys/socket.h> + #endif + + #ifdef HAVE_NETINET_IN6_H + #include <netinet/in6.h> + #endif + ]]) + +AC_MSG_CHECKING([for IPv6 support]) + +AC_ARG_ENABLE(ipv6, + AS_HELP_STRING([--disable-ipv6], [Disable support for IPv6 networking]), + [disable_ipv6=yes], [disable_ipv6=no]) + +if test x"$disable_ipv6" = xyes -o x"$have_in6_types" = xno; then + AC_MSG_RESULT([no]) +else + AC_DEFINE([HAVE_IPV6], [1], [Define if IPv6 networking support is present]) + AC_MSG_RESULT([yes]) +fi + +#-------------------------------------------------------------------- # Check for TCP wrapper support #-------------------------------------------------------------------- @@ -1040,12 +1076,6 @@ AC_CHECK_TYPES([int8, uint8, int16, uint16, int32, uint32, int64, uint64, uchar, uint, ulong],[],[], [ #include <sys/types.h> ]) -AC_CHECK_TYPES([in_addr_t], [], [], [ -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> -]) AC_CHECK_TYPES([fp_except], [], [], [ #include <sys/types.h> #include <ieeefp.h> |