Merge branch 'upstream'

[nfs-utils.git] / linux-nfs / Makefile.in

diff --git a/linux-nfs/Makefile.in b/linux-nfs/Makefile.in
index f2b1c608d06e3c0b66982e3f75623cd3cb11ca74..dfdec9e5b39a8cf49fb7b09ec70217fccaa310a3 100644 (file)
--- a/linux-nfs/Makefile.in
+++ b/linux-nfs/Makefile.in
@@ -36,9 +36,15 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        ChangeLog INSTALL THANKS TODO
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/aclocal/bsdsignals.m4 \
+       $(top_srcdir)/aclocal/ipv6.m4 \
        $(top_srcdir)/aclocal/kerberos5.m4 \
        $(top_srcdir)/aclocal/libblkid.m4 \
+       $(top_srcdir)/aclocal/libevent.m4 \
+       $(top_srcdir)/aclocal/libnfsidmap.m4 \
+       $(top_srcdir)/aclocal/librpcsecgss.m4 \
+       $(top_srcdir)/aclocal/libtirpc.m4 \
        $(top_srcdir)/aclocal/nfs-utils.m4 \
+       $(top_srcdir)/aclocal/rpcsec_vers.m4 \
        $(top_srcdir)/aclocal/tcp-wrappers.m4 \
        $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -54,6 +60,7 @@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
+AM_CPPFLAGS = @AM_CPPFLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -166,7 +173,6 @@ enable_gss = @enable_gss@
 enable_ipv6 = @enable_ipv6@
 enable_nfsv3 = @enable_nfsv3@
 enable_nfsv4 = @enable_nfsv4@
-enable_tirpc = @enable_tirpc@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@