X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=configure.ac;h=48d76d7c2a64dfac5abdcf98e1858dc1e77ee4cf;hp=37572083e6433163abeadd5d1253af12663a6d2b;hb=299a990de1b16ff769201fa0ed38249853254497;hpb=8e52cab35c708f5e99c7f294afdea67991795a57 diff --git a/configure.ac b/configure.ac index 3757208..48d76d7 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.0-rc2],[nfs@lists.sf.net],[nfs-utils]) +AC_INIT([linux nfs-utils],[1.1.4],[linux-nfs@vger.kernel.org],[nfs-utils]) AC_CANONICAL_BUILD([]) AC_CANONICAL_HOST([]) AC_CONFIG_MACRO_DIR(aclocal) @@ -95,26 +95,6 @@ AC_ARG_ENABLE(kprefix, test "$enableval" = "yes" && kprefix=k, kprefix=) AC_SUBST(kprefix) -AC_ARG_ENABLE(secure-statd, - [AC_HELP_STRING([--enable-secure-statd], - [Only lockd can use statd (security)])], - test "$enableval" = "yes" && secure_statd=yes, - secure_statd=yes) - if test "$secure_statd" = yes; then - AC_DEFINE(RESTRICTED_STATD, 1, [Define this if you want to enable various security checks in statd. These checks basically keep anyone but lockd from using this service.]) - fi - AC_SUBST(secure_statd) -AC_ARG_ENABLE(rquotad, - [AC_HELP_STRING([--enable-rquotad], - [enable rquotad @<:@default=yes@:>@])], - enable_rquotad=$enableval, - enable_rquotad=yes) - if test "$enable_rquotad" = yes; then - RQUOTAD=rquotad - else - RQUOTAD= - fi - AM_CONDITIONAL(CONFIG_RQUOTAD, [test "$enable_rquotad" = "yes"]) AC_ARG_WITH(rpcgen, [AC_HELP_STRING([--with-rpcgen=internal], [use internal rpcgen instead of system one])], rpcgen_path=$withval, @@ -130,15 +110,26 @@ AC_ARG_WITH(rpcgen, AM_CONDITIONAL(CONFIG_RPCGEN, [test "$RPCGEN_PATH" == ""]) AC_ARG_ENABLE(uuid, [AC_HELP_STRING([--without-uuid], [Exclude uuid support and so avoid possibly buggy libblkid])], - if test "$enableval" = "yes" ; then use_blkid=1; else use_blkid=0; fi, - use_blkid=1) - AC_DEFINE_UNQUOTED(USE_BLKID, $use_blkid, [Define if you want to use blkid to find uuid of filesystems]) + if test "$enableval" = "yes" ; then choose_blkid=yes; else choose_blkid=no; fi, + choose_blkid=default) AC_ARG_ENABLE(mount, [AC_HELP_STRING([--enable-mount], - [Create mount.nfs and don't use the util-linux mount(8) functionality. @<:@default=no@:>@])], + [Create mount.nfs and don't use the util-linux mount(8) functionality. @<:@default=yes@:>@])], enable_mount=$enableval, enable_mount=yes) AM_CONDITIONAL(CONFIG_MOUNT, [test "$enable_mount" = "yes"]) +AC_ARG_ENABLE(ipv6, + [AC_HELP_STRING([--enable-ipv6], + [enable support for IPv6 @<:@default=no@:>@])], + enable_ipv6=$enableval, + enable_ipv6=no) + if test "$enable_ipv6" = yes; then + AC_DEFINE(IPV6_SUPPORTED, 1, [Define this if you want IPv6 support compiled in]) + else + enable_ipv6= + fi + AC_SUBST(enable_ipv6) + AM_CONDITIONAL(CONFIG_IPV6, [test "$enable_ipv6" = "yes"]) # Check whether user wants TCP wrappers support AC_TCP_WRAPPERS @@ -184,6 +175,15 @@ AC_CHECK_FUNC(connect, , AC_CHECK_LIB(socket, connect, [LIBSOCKET="-lsocket"], AC_MSG_ERROR(Function 'socket' not found.), $LIBNSL)) +AC_CHECK_FUNC(getaddrinfo, , , + AC_MSG_ERROR(Function 'getaddrinfo' not found.)) + +AC_CHECK_FUNC(getrpcbynumber, , , + AC_MSG_ERROR(Function 'getrpcbynumber' not found.)) + +AC_CHECK_FUNC(getservbyname, , , + AC_MSG_ERROR(Function 'getservbyname' not found.)) + AC_CHECK_LIB(crypt, crypt, [LIBCRYPT="-lcrypt"]) if test "$enable_nfsv4" = yes; then AC_CHECK_LIB(event, event_dispatch, [libevent=1], AC_MSG_ERROR([libevent needed for nfsv4 support])) @@ -193,20 +193,33 @@ if test "$enable_nfsv4" = yes; then 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.10, , + 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(GSSAPI, libgssapi >= 0.11) + PKG_CHECK_MODULES(GSSGLUE, libgssglue >= 0.1) fi fi if test "$knfsd_cv_glibc2" = no; then AC_CHECK_LIB(bsd, daemon, [LIBBSD="-lbsd"]) fi -if test "$use_blkid" = 1; then - AC_CHECK_LIB(blkid, blkid_get_cache, [LIBBLKID="-lblkid"], AC_MSG_ERROR([libblkid needed])) - AC_CHECK_HEADER(blkid/blkid.h, , AC_MSG_ERROR([Cannot file libblkid header file blkid/blkid.h])) + +if test "$choose_blkid" != no; then + AC_CHECK_LIB(blkid, blkid_get_library_version, [LIBBLKID="-lblkid"], AC_MSG_ERROR([libblkid needed])) + AC_CHECK_HEADER(blkid/blkid.h, , AC_MSG_ERROR([Cannot find libblkid header file blkid/blkid.h])) + AC_BLKID_VERS + if test $choose_blkid = yes; then + use_blkid=1 + test $libblkid_is_recent = no && AC_MSG_WARN([libblkid is old and may cause mountd to leak memory]) + else + if test $libblkid_is_recent = yes + then use_blkid=1 + else use_blkid=0 + AC_MSG_WARN([uuid support disabled as libblkid is too old]) + fi + fi + AC_DEFINE_UNQUOTED(USE_BLKID, $use_blkid, [Define if you want to use blkid to find uuid of filesystems]) fi AC_SUBST(LIBSOCKET) AC_SUBST(LIBCRYPT) @@ -227,10 +240,21 @@ if test "$enable_gss" = yes; then 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]), -lgssapi -ldl) + 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]),, -lgssapi -ldl) + AC_DEFINE(HAVE_AUTHGSS_SET_DEBUG_LEVEL, 1, [Define this if the rpcsec_gss library has the function authgss_set_debug_level]),, -lgssglue -ldl) + +fi +if test "$enable_ipv6" = yes; then + AC_CHECK_FUNC(inet_ntop, , , + AC_MSG_ERROR(Function 'inet_ntop' not found.)) + 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-devel needed for IPv6 support])) fi dnl ************************************************************* @@ -241,7 +265,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]) + ifaddrs.h tirpc/netconfig.h]) dnl ************************************************************* dnl Checks for typedefs, structures, and compiler characteristics @@ -277,13 +301,17 @@ 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 \ gettimeofday hasmntopt inet_ntoa innetgr memset mkdir pathconf \ realpath rmdir select socket strcasecmp strchr strdup \ strerror strrchr strtol strtoul sigprocmask]) dnl ************************************************************* -dnl Check for data sizes (XXX These should go away with libgssapi pkg-config) +dnl Check for data sizes dnl ************************************************************* AC_CHECK_SIZEOF(short) AC_CHECK_SIZEOF(int) @@ -325,14 +353,14 @@ dnl ************************************************************* dnl Use architecture-specific compile flags dnl (We use $host and not $build in case we are cross-compiling) dnl ************************************************************* +dnl Note: we no longer have arch specific compile flags, but +dnl the stub is left here in case they are needed one day. case $host in - alpha*) - ARCHFLAGS="-mno-fp-regs -ffixed-8" ;; *) ARCHFLAGS="" ;; esac -my_am_cflags="-Wall $ARCHFLAGS -pipe" +my_am_cflags="-Wall -Wstrict-prototypes $ARCHFLAGS -pipe" AC_SUBST([AM_CPPFLAGS], ["-I\${top_srcdir}/support/include"]) AC_SUBST([AM_CFLAGS], ["$my_am_cflags"]) @@ -365,7 +393,6 @@ AC_CONFIG_FILES([ utils/mountd/Makefile utils/nfsd/Makefile utils/nfsstat/Makefile - utils/rquotad/Makefile utils/showmount/Makefile utils/statd/Makefile]) AC_OUTPUT