From: Neil Brown <neilb@suse.de>
Date: Thu, 29 Mar 2007 03:20:20 +0000 (+1000)
Subject: Change default to use system rpcgen.
X-Git-Tag: nfs-utils-1-1-0-rc1~4
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=060f523e68274fcd04eb8ecdae51688cb864a5f9;p=nfs-utils.git

Change default to use system rpcgen.

If system-installed rpcgen if such exists.
If none is found, build our own.
Override with
   ./configure --with-rpcgen=internal
for internal rpcgen or
   ./configure --with-rpcgen=/local/rpcgen
for a non-standard location.
---

diff --git a/configure.in b/configure.in
index 2a72c1c..2ed751b 100644
--- a/configure.in
+++ b/configure.in
@@ -116,13 +116,16 @@ AC_ARG_ENABLE(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
+	[AC_HELP_STRING([--with-rpcgen=internal], [use internal rpcgen instead of system one])],
+	rpcgen_path=$withval,
+	rpcgen_path=yes )
+	RPCGEN_PATH=
+	if test "$rpcgen_path" == "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
+	    do if test -f $p ; then RPCGEN_PATH=$p ; break; fi ; done
+	elif test "$rpcgen_path" != "internal"; then
+	    RPCGEN_PATH=$rpcgen_path
 	fi
-	RPCGEN_PATH=$withval,
-	RPCGEN_PATH= )
 	AC_SUBST(RPCGEN_PATH)
 	AM_CONDITIONAL(CONFIG_RPCGEN, [test "$RPCGEN_PATH" == ""])
 AC_ARG_ENABLE(uuid,