X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=configure.in;h=2a72c1c7f850c99b71245bd28afec264c99c2e67;hp=a70b70897474bf2231fe5ca10e0e51c02acf2840;hb=b3b111b1bd5fbc678419bf1964b6093045081139;hpb=bb39384a6cfdd1a0e3c2d3cad2ebfd0c6e5c5fef

diff --git a/configure.in b/configure.in
index a70b708..2a72c1c 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.10],[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
@@ -106,17 +115,34 @@ AC_ARG_ENABLE(rquotad,
 		RQUOTAD=
 	fi
 	AM_CONDITIONAL(CONFIG_RQUOTAD, [test "$enable_rquotad" = "yes"])
-
+AC_ARG_WITH(rpcgen,
+	[AC_HELP_STRING([--with-rpcgen=/usr/bin/rpcgen], [use system rpcgen instead of compiling our own])],
+	if test "$withval" == "yes"; then
+	    for p in /usr/local/bin/rpcgen /usr/bin/rpcgen /bin/rpcgen
+	    do if test -f $p ; then withval=$p ; break; fi ; done
+	fi
+	RPCGEN_PATH=$withval,
+	RPCGEN_PATH= )
+	AC_SUBST(RPCGEN_PATH)
+	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])
 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)
+	enable_mount=yes)
 	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 +154,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 +174,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]))
@@ -169,10 +201,14 @@ 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]))
+fi
 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
@@ -295,7 +331,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
@@ -314,8 +350,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
@@ -324,12 +358,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])