X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=configure.in;h=4f645237d498b52ce93a7ae3f8d3d71e028976f2;hp=61e5be241473403ad6f98d7fc0d0282d49345533;hb=f4a94f9c70e279aa72a2d6aa6874c8406f68987c;hpb=0119db87190ffa3c304529edd1edfd9ae3e2cf0d diff --git a/configure.in b/configure.in index 61e5be2..4f64523 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,6 @@ dnl 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) @@ -38,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@:>@])], @@ -91,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 @@ -118,6 +126,9 @@ AC_ARG_ENABLE(mount, # 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]) @@ -129,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}} @@ -303,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 @@ -322,7 +334,6 @@ AC_CONFIG_FILES([ support/misc/Makefile support/nfs/Makefile tools/Makefile - tools/getiversion/Makefile tools/locktest/Makefile tools/nlmtest/Makefile tools/rpcdebug/Makefile @@ -331,7 +342,6 @@ AC_CONFIG_FILES([ utils/exportfs/Makefile utils/gssd/Makefile utils/idmapd/Makefile - utils/lockd/Makefile utils/mount/Makefile utils/mountd/Makefile utils/nfsd/Makefile