Merge branch 'upstream'

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

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 79aff242437722d7324209218ee91dd4ef2052f1..231b77bb8d925ca0764abf9b11c060490858433c 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -41,6 +41,7 @@ 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/libcap.m4 \
        $(top_srcdir)/aclocal/libevent.m4 \
        $(top_srcdir)/aclocal/libnfsidmap.m4 \
        $(top_srcdir)/aclocal/librpcsecgss.m4 \
@@ -155,6 +156,7 @@ LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
 LIBBLKID = @LIBBLKID@
 LIBBSD = @LIBBSD@
+LIBCAP = @LIBCAP@
 LIBCRYPT = @LIBCRYPT@
 LIBNSL = @LIBNSL@
 LIBOBJS = @LIBOBJS@
@@ -221,6 +223,7 @@ enable_ipv6 = @enable_ipv6@
 enable_mountconfig = @enable_mountconfig@
 enable_nfsv3 = @enable_nfsv3@
 enable_nfsv4 = @enable_nfsv4@
+enable_nfsv41 = @enable_nfsv41@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
@@ -306,7 +309,7 @@ clean-libtool:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-       @failcom='exit 1'; \
+       @fail= failcom='exit 1'; \
        for f in x $$MAKEFLAGS; do \
          case $$f in \
            *=* | --[!k]*);; \
@@ -331,7 +334,7 @@ $(RECURSIVE_TARGETS):
        fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-       @failcom='exit 1'; \
+       @fail= failcom='exit 1'; \
        for f in x $$MAKEFLAGS; do \
          case $$f in \
            *=* | --[!k]*);; \