X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=configure.in;h=124065632cc13e1d34051b2349aedaa29dac3196;hp=1cac7678c9a70652581b74b4426bf90482dbb1a2;hb=453ac684258684e0e8413f4d9ef9822e753d9dbb;hpb=6108478a99884f38c8afd1d1f2a0de1580113bd2

diff --git a/configure.in b/configure.in
index 1cac767..1240656 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)
@@ -116,7 +115,16 @@ 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(mount,
 	[AC_HELP_STRING([--enable-mount],
 			[Create mount.nfs and don't use the util-linux mount(8) functionality. @<:@default=no@:>@])],
@@ -141,6 +149,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}}
@@ -334,7 +343,6 @@ AC_CONFIG_FILES([
 	support/misc/Makefile
 	support/nfs/Makefile
 	tools/Makefile
-	tools/getiversion/Makefile
 	tools/locktest/Makefile
 	tools/nlmtest/Makefile
 	tools/rpcdebug/Makefile