X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=configure.ac;h=1dc42496af2459904ca37458da43ae130ae35630;hp=0d5f5a6054ba715a4e8a214c9878b7e3e027e9b6;hb=4bc0dbaed1ba2f58beea2cdb0595b461e0c88b8e;hpb=767773f33c10dfeaf44ef7d6aea0946f5d9d248f diff --git a/configure.ac b/configure.ac index 0d5f5a6..1dc4249 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -AC_INIT([linux nfs-utils],[1.1.5],[linux-nfs@vger.kernel.org],[nfs-utils]) +AC_INIT([linux nfs-utils],[1.2.1],[linux-nfs@vger.kernel.org],[nfs-utils]) AC_CANONICAL_BUILD([]) AC_CANONICAL_HOST([]) AC_CONFIG_MACRO_DIR(aclocal) @@ -120,9 +120,9 @@ AC_ARG_ENABLE(mount, AM_CONDITIONAL(CONFIG_MOUNT, [test "$enable_mount" = "yes"]) AC_ARG_ENABLE(tirpc, [AC_HELP_STRING([--enable-tirpc], - [enable use of TI-RPC @<:@default=no@:>@])], + [enable use of TI-RPC @<:@default=yes@:>@])], enable_tirpc=$enableval, - enable_tirpc=no) + enable_tirpc='yes') AC_ARG_ENABLE(ipv6, [AC_HELP_STRING([--enable-ipv6], [enable support for IPv6 @<:@default=no@:>@])], @@ -136,9 +136,39 @@ AC_ARG_ENABLE(ipv6, AC_SUBST(enable_ipv6) AM_CONDITIONAL(CONFIG_IPV6, [test "$enable_ipv6" = "yes"]) +if test "$enable_mount" = yes; then + AC_ARG_ENABLE(mountconfig, + [AC_HELP_STRING([--enable-mountconfig], + [enable mount to use a configuration file])], + mountconfig=$enableval, + mountconfig=no) + if test "$enable_mountconfig" = yes; then + AC_DEFINE(MOUNT_CONFIG, 1, + [Define this if you want mount to read a configuration file]) + AC_ARG_WITH(mountfile, + [AC_HELP_STRING([--with-mountfile=filename], + [Using filename as the NFS mount options file [/etc/nfsmounts.conf]] + )], + mountfile=$withval, + mountfile=/etc/nfsmount.conf) + AC_SUBST(mountfile) + AC_DEFINE_UNQUOTED(MOUNTOPTS_CONFFILE, "$mountfile", + [This defines the location of the NFS mount configuration file]) + else + enable_mountconfig= + fi + AC_SUBST(enable_mountconfig) + AM_CONDITIONAL(MOUNT_CONFIG, [test "$enable_mountconfig" = "yes"]) +else + AM_CONDITIONAL(MOUNT_CONFIG, [test "$enable_mount" = "yes"]) +fi + dnl Check for TI-RPC library and headers AC_LIBTIRPC +dnl Check for -lcap +AC_LIBCAP + # Check whether user wants TCP wrappers support AC_TCP_WRAPPERS @@ -185,13 +215,13 @@ AC_CHECK_FUNC([connect], , [AC_CHECK_LIB([socket], [connect], [LIBSOCKET="-lsocket"], [AC_MSG_ERROR([Function 'socket' not found.])], [$LIBNSL])]) -AC_CHECK_FUNC([getaddrinfo], , , +AC_CHECK_FUNC([getaddrinfo], , [AC_MSG_ERROR([Function 'getaddrinfo' not found.])]) -AC_CHECK_FUNC([getrpcbynumber], , , +AC_CHECK_FUNC([getrpcbynumber], , [AC_MSG_ERROR([Function 'getrpcbynumber' not found.])]) -AC_CHECK_FUNC([getservbyname], , , +AC_CHECK_FUNC([getservbyname], , [AC_MSG_ERROR([Function 'getservbyname' not found.])]) AC_CHECK_LIB([crypt], [crypt], [LIBCRYPT="-lcrypt"]) @@ -203,17 +233,13 @@ if test "$enable_nfsv4" = yes; then dnl check for nfsidmap libraries and headers AC_LIBNFSIDMAP - dnl librpcsecgss already has a dependency on libgssapi, - dnl but we need to make sure we get the right version - if test "$enable_gss" = yes; then - PKG_CHECK_MODULES(RPCSECGSS, librpcsecgss >= 0.16, , - [AC_MSG_ERROR([Unable to locate information required to use librpcsecgss. If you have pkgconfig installed, you might try setting environment variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig]) - ] - ) - PKG_CHECK_MODULES(GSSGLUE, libgssglue >= 0.1) - fi - + dnl librpcsecgss already has a dependency on libgssapi, + dnl but we need to make sure we get the right version + if test "$enable_gss" = yes; then + AC_RPCSEC_VERSION + fi fi + if test "$knfsd_cv_glibc2" = no; then AC_CHECK_LIB(bsd, daemon, [LIBBSD="-lbsd"]) fi @@ -240,6 +266,9 @@ AC_SUBST(LIBBSD) AC_SUBST(LIBBLKID) if test "$enable_gss" = yes; then + dnl 'gss' requires getnameinfo - at least for gssd_proc.c + AC_CHECK_FUNC([getnameinfo], , [AC_MSG_ERROR([GSSAPI support requires 'getnameinfo' function])]) + dnl 'gss' also depends on nfsidmap.h - at least for svcgssd_proc.c AC_LIBNFSIDMAP @@ -249,29 +278,13 @@ if test "$enable_gss" = yes; then dnl Check for Kerberos V5 AC_KERBEROS_V5 - dnl This is not done until here because we need to have KRBLIBS set - dnl ("librpcsecgss=1" is so that it doesn't get added to LIBS) - AC_CHECK_LIB(rpcsecgss, authgss_create_default, [librpcsecgss=1], AC_MSG_ERROR([librpcsecgss needed for nfsv4 support]), -lgssglue -ldl) - AC_CHECK_LIB(rpcsecgss, authgss_set_debug_level, - AC_DEFINE(HAVE_AUTHGSS_SET_DEBUG_LEVEL, 1, [Define this if the rpcsec_gss library has the function authgss_set_debug_level]),, -lgssglue -ldl) + dnl Invoked after AC_KERBEROS_V5; AC_LIBRPCSECGSS needs to have KRBLIBS set + AC_LIBRPCSECGSS fi -AC_CHECK_DECL([AI_ADDRCONFIG], - AC_DEFINE([HAVE_DECL_AI_ADDRCONFIG], 1, - [Define this to 1 if AI_ADDRCONFIG macro is defined]), , - [ #include ] ) - -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 ] ) -fi +dnl Check for IPv6 support +AC_IPV6 dnl ************************************************************* dnl Check for headers @@ -317,7 +330,7 @@ AC_FUNC_STAT AC_FUNC_VPRINTF AC_CHECK_FUNCS([alarm atexit dup2 fdatasync ftruncate getcwd \ gethostbyaddr gethostbyname gethostname getmntent \ - getnameinfo getrpcbyname \ + getnameinfo getrpcbyname getifaddrs \ gettimeofday hasmntopt inet_ntoa innetgr memset mkdir pathconf \ realpath rmdir select socket strcasecmp strchr strdup \ strerror strrchr strtol strtoul sigprocmask]) @@ -392,6 +405,7 @@ AC_CONFIG_FILES([ support/include/Makefile support/misc/Makefile support/nfs/Makefile + support/nsm/Makefile tools/Makefile tools/locktest/Makefile tools/nlmtest/Makefile @@ -406,6 +420,8 @@ AC_CONFIG_FILES([ utils/nfsd/Makefile utils/nfsstat/Makefile utils/showmount/Makefile - utils/statd/Makefile]) + utils/statd/Makefile + tests/Makefile + tests/nsm_client/Makefile]) AC_OUTPUT