diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2009-03-16 13:37:09 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2009-03-16 13:37:09 -0400 |
| commit | 530abf870f5188b2bdd4a9211d7c93fb6ce68854 (patch) | |
| tree | 1d2ed9ac28c130409501ed1a967dc3e073528d6f | |
| parent | fd6a34c83051f82c9064963e24976bf3c47a5422 (diff) | |
| download | nfs-utils-530abf870f5188b2bdd4a9211d7c93fb6ce68854.tar.gz nfs-utils-530abf870f5188b2bdd4a9211d7c93fb6ce68854.tar.xz nfs-utils-530abf870f5188b2bdd4a9211d7c93fb6ce68854.zip | |
configure: move IPv6 feature checks into aclocal
Clean up: for consistency with other local feature checks, move IPv6
feature checks into aclocal/
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | aclocal/ipv6.m4 | 29 | ||||
| -rw-r--r-- | configure.ac | 17 |
3 files changed, 33 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index 098446b..b3a6e91 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,7 +44,8 @@ EXTRA_DIST = \ aclocal/libtirpc.m4 \ aclocal/libevent.m4 \ aclocal/libnfsidmap.m4 \ - aclocal/rpcsec_vers.m4 + aclocal/rpcsec_vers.m4 \ + aclocal/ipv6.m4 ACLOCAL_AMFLAGS = -I aclocal diff --git a/aclocal/ipv6.m4 b/aclocal/ipv6.m4 new file mode 100644 index 0000000..0564b3e --- /dev/null +++ b/aclocal/ipv6.m4 @@ -0,0 +1,29 @@ +dnl Checks for IPv6 support +dnl +AC_DEFUN([AC_IPV6], [ + + AC_CHECK_DECL([AI_ADDRCONFIG], + [AC_DEFINE([HAVE_DECL_AI_ADDRCONFIG], 1, + [Define this to 1 if AI_ADDRCONFIG macro is defined])], , + [ #include <netdb.h> ]) + + if test "$enable_ipv6" = yes; then + + dnl TI-RPC required for IPv6 + if test "$enable_tirpc" = no; then + AC_MSG_ERROR(['--enable-ipv6' requires '--enable-tirpc'.]) + fi + + dnl IPv6-enabled networking functions required for IPv6 + AC_CHECK_FUNCS([getnameinfo bindresvport_sa], , , + [AC_MSG_ERROR([Missing functions needed for IPv6.])]) + + dnl Need to detect presence of IPv6 networking at run time via + dnl getaddrinfo(3); old versions of glibc do not support ADDRCONFIG + AC_CHECK_DECL([AI_ADDRCONFIG], , + [AC_MSG_ERROR([full getaddrinfo(3) implementation needed for IPv6 support])], + [ #include <netdb.h> ]) + + fi + +])dnl diff --git a/configure.ac b/configure.ac index 7d25384..e34b7e2 100644 --- a/configure.ac +++ b/configure.ac @@ -250,21 +250,8 @@ if test "$enable_gss" = yes; then fi -AC_CHECK_DECL([AI_ADDRCONFIG], - AC_DEFINE([HAVE_DECL_AI_ADDRCONFIG], 1, - [Define this to 1 if AI_ADDRCONFIG macro is defined]), , - [ #include <netdb.h> ] ) - -if test "$enable_ipv6" = yes; then - if test "$enable_tirpc" = no; then - AC_MSG_ERROR('--enable-ipv6' requires '--enable-tirpc'.) - fi - AC_CHECK_FUNCS([getnameinfo bindresvport_sa], , , - [AC_MSG_ERROR([Missing functions needed for IPv6.])]) - AC_CHECK_DECL([AI_ADDRCONFIG], , - AC_MSG_ERROR([full getaddrinfo(3) implementation needed for IPv6 support]), - [ #include <netdb.h> ] ) -fi +dnl Check for IPv6 support +AC_IPV6 dnl ************************************************************* dnl Check for headers |