X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=configure.ac;h=c8508f1328a382a43ee78a656cd6393fa1c8f80a;hp=7140f48cbf5c10a0cd31ed1d38c1397635f7ba35;hb=3163dabcf0a6b992859508368baf67c918d2c091;hpb=533e5a05a172306462ac6c11d222a18fe562ec6d

diff --git a/configure.ac b/configure.ac
index 7140f48..c8508f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,6 +131,14 @@ AC_ARG_ENABLE(ipv6,
 	AC_SUBST(enable_ipv6)
 	AM_CONDITIONAL(CONFIG_IPV6, [test "$enable_ipv6" = "yes"])
 
+AC_ARG_ENABLE(tirpc,
+	[AC_HELP_STRING([--enable-tirpc],
+                        [enable use of TI-RPC @<:@default=no@:>@])],
+	enable_tirpc=$enableval,
+	enable_tirpc=no)
+	AC_SUBST(enable_tirpc)
+	AM_CONDITIONAL(CONFIG_TIRPC, [test "$enable_tirpc" = "yes"])
+
 # Check whether user wants TCP wrappers support
 AC_TCP_WRAPPERS
 
@@ -251,15 +259,22 @@ AC_CHECK_DECL([AI_ADDRCONFIG],
                          [Define this to 1 if AI_ADDRCONFIG macro is defined]), ,
               [ #include <netdb.h> ] )
 
+if test "$enable_tirpc" = yes; then
+  AC_CHECK_LIB(tirpc, clnt_tli_create, ,
+           AC_MSG_ERROR([libtirpc not found.]))
+  AC_CHECK_HEADERS(tirpc/netconfig.h, ,
+                   AC_MSG_ERROR([libtirpc headers not found.]))
+  AC_CHECK_FUNCS([bindresvport_sa getnetconfig \
+                  clnt_create clnt_create_timed \
+                  clnt_vc_create clnt_dg_create xdr_rpcb])
+fi
+
 if test "$enable_ipv6" = yes; then
-  AC_CHECK_FUNC(inet_ntop, , ,
-               AC_MSG_ERROR(Function 'inet_ntop' not found.))
+  if test "$enable_tirpc" = no; then
+    AC_MSG_ERROR('--enable-ipv6' requires '--enable-tirpc'.)
+  fi
   AC_CHECK_FUNC(getnameinfo, , ,
                AC_MSG_ERROR(Function 'getnameinfo' not found.))
-  AC_CHECK_LIB(tirpc, clnt_tli_create, ,
-               AC_MSG_ERROR([libtirpc needed for IPv6 support]))
-  AC_CHECK_HEADERS(tirpc/netconfig.h, ,
-               AC_MSG_ERROR([libtirpc headers needed for IPv6 support]))
   AC_CHECK_DECL([AI_ADDRCONFIG], ,
                AC_MSG_ERROR([full getaddrinfo(3) implementation needed for IPv6 support]),
                [ #include <netdb.h> ] )
@@ -273,7 +288,7 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h \
                  stdlib.h string.h sys/file.h sys/ioctl.h sys/mount.h \
                  sys/param.h sys/socket.h sys/time.h sys/vfs.h \
                  syslog.h unistd.h com_err.h et/com_err.h \
-                 ifaddrs.h tirpc/netconfig.h])
+                 ifaddrs.h])
 
 dnl *************************************************************
 dnl Checks for typedefs, structures, and compiler characteristics
@@ -309,10 +324,7 @@ AC_FUNC_STAT
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([alarm atexit dup2 fdatasync ftruncate getcwd \
                gethostbyaddr gethostbyname gethostname getmntent \
-               inet_ntop getnameinfo getrpcbyname \
-               bindresvport_sa getnetconfig \
-               clnt_create clnt_create_timed \
-               clnt_tli_create clnt_vc_create clnt_dg_create xdr_rpcb \
+               getnameinfo getrpcbyname \
                gettimeofday hasmntopt inet_ntoa innetgr memset mkdir pathconf \
                realpath rmdir select socket strcasecmp strchr strdup \
                strerror strrchr strtol strtoul sigprocmask])