Merge branch 'upstream'

[nfs-utils.git] / support / export / Makefile.in

diff --git a/support/export/Makefile.in b/support/export/Makefile.in
index 8d1c34283bf92e7bc889560dd5144d4856823f0c..c16aede9c014f713ad83c0c5a01c9054bebb5e87 100644 (file)
--- a/support/export/Makefile.in
+++ b/support/export/Makefile.in
@@ -39,9 +39,10 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/aclocal/bsdsignals.m4 \
        $(top_srcdir)/aclocal/kerberos5.m4 \
+       $(top_srcdir)/aclocal/libblkid.m4 \
        $(top_srcdir)/aclocal/nfs-utils.m4 \
        $(top_srcdir)/aclocal/tcp-wrappers.m4 \
-       $(top_srcdir)/configure.in
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -153,6 +154,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RELEASE = @RELEASE@
+RPCGEN_PATH = @RPCGEN_PATH@
 RPCSECGSS_CFLAGS = @RPCSECGSS_CFLAGS@
 RPCSECGSS_LIBS = @RPCSECGSS_LIBS@
 SET_MAKE = @SET_MAKE@
@@ -212,13 +214,13 @@ sbindir = @sbindir@
 secure_statd = @secure_statd@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
+startstatd = @startstatd@
 statduser = @statduser@
 statedir = @statedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-RPCGEN = $(top_builddir)/tools/rpcgen/rpcgen
 GENFILES_CLNT = mount_clnt.c
 GENFILES_XDR = mount_xdr.c
 GENFILES_H = mount.h
@@ -230,6 +232,8 @@ libexport_a_SOURCES = client.c export.c hostname.c nfsctl.c rmtab.c \
 
 BUILT_SOURCES = $(GENFILES)
 noinst_HEADERS = mount.h
+@CONFIG_RPCGEN_FALSE@RPCGEN = @RPCGEN_PATH@
+@CONFIG_RPCGEN_TRUE@RPCGEN = $(top_builddir)/tools/rpcgen/rpcgen
 MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES = $(GENFILES) $(top_builddir)/support/include/mount.h
 all: $(BUILT_SOURCES)
@@ -505,9 +509,8 @@ dist-hook:
        for f in $(GENFILES); do \
          rm ${distdir}/$$f; \
        done
-
-$(RPCGEN):
-       make -C $(top_srcdir)/tools/rpcgen all
+@CONFIG_RPCGEN_TRUE@$(RPCGEN):
+@CONFIG_RPCGEN_TRUE@   make -C $(top_srcdir)/tools/rpcgen all
 
 $(GENFILES_CLNT): %_clnt.c: %.x $(RPCGEN)
        test -f $@ && rm -rf $@ || true