X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=configure.in;h=4f645237d498b52ce93a7ae3f8d3d71e028976f2;hp=bcac7d85fd01f221acb67f663d2f73f480e9d1ab;hb=f4a94f9c70e279aa72a2d6aa6874c8406f68987c;hpb=24d303ffae686192bda0a5996e8590219dcc82e7 diff --git a/configure.in b/configure.in index bcac7d8..4f64523 100644 --- a/configure.in +++ b/configure.in @@ -1,13 +1,13 @@ dnl Process this file with autoconf to produce a configure script. dnl -AC_INIT([linux nfs-utils],[1.0.8],[nfs@lists.sf.net],[nfs-utils]) +AC_INIT([linux nfs-utils],[1.0.11],[nfs@lists.sf.net],[nfs-utils]) AC_CANONICAL_BUILD([]) AC_CANONICAL_HOST([]) -AC_CONFIG_SRCDIR(tools/getiversion/getiversion.c) AC_CONFIG_MACRO_DIR(aclocal) AM_INIT_AUTOMAKE AC_PREREQ(2.59) AC_PREFIX_DEFAULT(/usr) +AM_MAINTAINER_MODE dnl ************************************************************* dnl * Define the set of applicable options @@ -37,6 +37,15 @@ AC_ARG_WITH(statduser, statduser=nobody fi) AC_SUBST(statduser) +AC_ARG_WITH(start-statd, + [AC_HELP_STRING([--with-start-statd=scriptname], + [When an nfs filesystems is mounted with locking, run this script] + )], + startstatd=$withval, + startstatd=/usr/sbin/start-statd + ) + AC_SUBST(startstatd) + AC_DEFINE_UNQUOTED(START_STATD, "$startstatd", [Define this to a script which can start statd on mount]) AC_ARG_ENABLE(nfsv3, [AC_HELP_STRING([--enable-nfsv3], [enable support for NFSv3 @<:@default=yes@:>@])], @@ -90,7 +99,7 @@ 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=no) + 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 @@ -107,16 +116,19 @@ AC_ARG_ENABLE(rquotad, fi AM_CONDITIONAL(CONFIG_RQUOTAD, [test "$enable_rquotad" = "yes"]) -AC_ARG_WITH(mount, - [AC_HELP_STRING([--without-mount], - [Create mount.nfs and do not use the util-linux mount(8) functionality. By default it doesn't.])], - use_mount=$withval, - use_mount=yes) - AM_CONDITIONAL(CONFIG_NOMOUNT, [test "$use_mount" = "no"]) +AC_ARG_ENABLE(mount, + [AC_HELP_STRING([--enable-mount], + [Create mount.nfs and don't use the util-linux mount(8) functionality. @<:@default=no@:>@])], + enable_mount=$enableval, + enable_mount=no) + AM_CONDITIONAL(CONFIG_MOUNT, [test "$enable_mount" = "yes"]) # Check whether user wants TCP wrappers support AC_TCP_WRAPPERS +# Arrange for large-file support +AC_SYS_LARGEFILE + AC_CONFIG_SRCDIR([support/include/config.h.in]) AC_CONFIG_HEADERS([support/include/config.h]) @@ -128,6 +140,7 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_LIBTOOL +AM_PROG_CC_C_O if test "x$cross_compiling" = "xno"; then CC_FOR_BUILD=${CC_FOR_BUILD-${CC-gcc}} @@ -147,8 +160,13 @@ AC_BSD_SIGNALS dnl ************************************************************* dnl * Check for required libraries dnl ************************************************************* -AC_CHECK_LIB(socket, main, [LIBSOCKET="-lnsl"]) -AC_CHECK_LIB(nsl, main, [LIBNSL="-lnsl"]) +AC_CHECK_FUNC(gethostbyname, , [AC_CHECK_LIB(nsl, gethostbyname, [LIBNSL="-lnsl"])]) +AC_SUBST(LIBNSL) + +AC_CHECK_FUNC(connect, , + AC_CHECK_LIB(socket, connect, [LIBSOCKET="-lsocket"], + AC_MSG_ERROR(Function 'socket' not found.), $LIBNSL)) + 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])) @@ -158,37 +176,41 @@ 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], [], - [AC_MSG_ERROR([Unable to locate information required to use librpcsecgss.]) - AC_MSG_ERROR([If you have pkgconfig installed, you might try setting environment]) - AC_MSG_ERROR([variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig]) + PKG_CHECK_MODULES(RPCSECGSS, librpcsecgss >= 0.10, , + [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.9]) + PKG_CHECK_MODULES(GSSAPI, libgssapi >= 0.9) fi fi if test "$knfsd_cv_glibc2" = no; then AC_CHECK_LIB(bsd, daemon, [LIBBSD="-lbsd"]) fi +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])) AC_SUBST(LIBSOCKET) -AC_SUBST(LIBNSL) AC_SUBST(LIBCRYPT) AC_SUBST(LIBBSD) +AC_SUBST(LIBBLKID) if test "$enable_gss" = yes; then dnl 'gss' also depends on nfsidmap.h - at least for svcgssd_proc.c AC_CHECK_HEADERS(nfsidmap.h, ,AC_MSG_ERROR([libnfsidmap needed for gss support])) AC_CHECK_HEADERS(spkm3.h, ,AC_MSG_WARN([could not locate SPKM3 header; will not have SPKM3 support])) + dnl the nfs4_set_debug function doesn't appear in all version of the library + AC_CHECK_LIB(nfsidmap, nfs4_set_debug, + AC_DEFINE(HAVE_NFS4_SET_DEBUG,1, + [Whether nfs4_set_debug() is present in libnfsidmap]),) 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]), $KRBLIBS) + AC_CHECK_LIB(rpcsecgss, authgss_create_default, [librpcsecgss=1], AC_MSG_ERROR([librpcsecgss needed for nfsv4 support]), -lgssapi -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]),, $KRBLIBS) + AC_DEFINE(HAVE_AUTHGSS_SET_DEBUG_LEVEL, 1, [Define this if the rpcsec_gss library has the function authgss_set_debug_level]),, -lgssapi -ldl) fi @@ -238,7 +260,7 @@ AC_CHECK_FUNCS([alarm atexit dup2 fdatasync ftruncate getcwd \ gethostbyaddr gethostbyname gethostname getmntent \ gettimeofday hasmntopt inet_ntoa innetgr memset mkdir pathconf \ realpath rmdir select socket strcasecmp strchr strdup \ - strerror strrchr strtol strtoul]) + strerror strrchr strtol strtoul sigprocmask]) dnl ************************************************************* @@ -248,6 +270,8 @@ AC_CHECK_SIZEOF(short) AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) AC_CHECK_SIZEOF(size_t) +AC_CHECK_SIZEOF(socklen_t) + dnl ************************************************************* dnl Export some path names to config.h @@ -291,7 +315,7 @@ esac my_am_cflags="-Wall $ARCHFLAGS -pipe" -AC_SUBST([AM_CPPFLAGS], ["-I\${top_srcdir}/support/include -D_FILE_OFFSET_BITS=64"]) +AC_SUBST([AM_CPPFLAGS], ["-I\${top_srcdir}/support/include"]) AC_SUBST([AM_CFLAGS], ["$my_am_cflags"]) # Make sure that $ACLOCAL_FLAGS are used during a rebuild @@ -310,8 +334,6 @@ AC_CONFIG_FILES([ support/misc/Makefile support/nfs/Makefile tools/Makefile - tools/getiversion/Makefile - tools/getkversion/Makefile tools/locktest/Makefile tools/nlmtest/Makefile tools/rpcdebug/Makefile @@ -320,12 +342,10 @@ AC_CONFIG_FILES([ utils/exportfs/Makefile utils/gssd/Makefile utils/idmapd/Makefile - utils/lockd/Makefile utils/mount/Makefile utils/mountd/Makefile utils/nfsd/Makefile utils/nfsstat/Makefile - utils/nhfsstone/Makefile utils/rquotad/Makefile utils/showmount/Makefile utils/statd/Makefile])