Add --with-rpcgen= for configure so that the system rpcgen can be used.

[nfs-utils.git] / configure.in

diff --git a/configure.in b/configure.in
index 1a1ce1a846bcb7577ff915ab394513a23d8794d5..124065632cc13e1d34051b2349aedaa29dac3196 100644 (file)
--- 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@:>@])],
@@ -127,6 +135,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])
 
@@ -138,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}}
@@ -312,7 +324,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
@@ -331,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