proper merge

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

diff --git a/tools/nlmtest/Makefile.in b/tools/nlmtest/Makefile.in
index 69173430dc487869b7efda1c82dd0d1cb039679b..68e84744d263f19ec2fa2dfb79ef11b01230f358 100644 (file)
--- a/tools/nlmtest/Makefile.in
+++ b/tools/nlmtest/Makefile.in
@@ -45,12 +45,8 @@ am__aclocal_m4_deps = $(top_srcdir)/aclocal/bsdsignals.m4 \
        $(top_srcdir)/aclocal/libevent.m4 \
        $(top_srcdir)/aclocal/libnfsidmap.m4 \
        $(top_srcdir)/aclocal/librpcsecgss.m4 \
        $(top_srcdir)/aclocal/libevent.m4 \
        $(top_srcdir)/aclocal/libnfsidmap.m4 \
        $(top_srcdir)/aclocal/librpcsecgss.m4 \

+       $(top_srcdir)/aclocal/libsqlite3.m4 \

        $(top_srcdir)/aclocal/libtirpc.m4 \
        $(top_srcdir)/aclocal/libtirpc.m4 \

-       $(top_srcdir)/aclocal/libtool.m4 \
-       $(top_srcdir)/aclocal/ltoptions.m4 \
-       $(top_srcdir)/aclocal/ltsugar.m4 \
-       $(top_srcdir)/aclocal/ltversion.m4 \
-       $(top_srcdir)/aclocal/lt~obsolete.m4 \

        $(top_srcdir)/aclocal/nfs-utils.m4 \
        $(top_srcdir)/aclocal/rpcsec_vers.m4 \
        $(top_srcdir)/aclocal/tcp-wrappers.m4 \
        $(top_srcdir)/aclocal/nfs-utils.m4 \
        $(top_srcdir)/aclocal/rpcsec_vers.m4 \
        $(top_srcdir)/aclocal/tcp-wrappers.m4 \


@@ -124,12 +120,17 @@ LIBBLKID = @LIBBLKID@
 LIBBSD = @LIBBSD@
 LIBCAP = @LIBCAP@
 LIBCRYPT = @LIBCRYPT@
 LIBBSD = @LIBBSD@
 LIBCAP = @LIBCAP@
 LIBCRYPT = @LIBCRYPT@

+LIBDL = @LIBDL@
+LIBEVENT = @LIBEVENT@

 LIBKEYUTILS = @LIBKEYUTILS@
 LIBMOUNT = @LIBMOUNT@
 LIBKEYUTILS = @LIBKEYUTILS@
 LIBMOUNT = @LIBMOUNT@

+LIBNFSIDMAP = @LIBNFSIDMAP@

 LIBNSL = @LIBNSL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOCKET = @LIBSOCKET@
 LIBNSL = @LIBNSL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOCKET = @LIBSOCKET@

+LIBSQLITE = @LIBSQLITE@
+LIBTIRPC = @LIBTIRPC@

 LIBTOOL = @LIBTOOL@
 LIBWRAP = @LIBWRAP@
 LIPO = @LIPO@
 LIBTOOL = @LIBTOOL@
 LIBWRAP = @LIBWRAP@
 LIPO = @LIPO@


@@ -194,7 +195,6 @@ dvidir = @dvidir@
 enable_gss = @enable_gss@
 enable_ipv6 = @enable_ipv6@
 enable_mountconfig = @enable_mountconfig@
 enable_gss = @enable_gss@
 enable_ipv6 = @enable_ipv6@
 enable_mountconfig = @enable_mountconfig@

-enable_nfsv3 = @enable_nfsv3@

 enable_nfsv4 = @enable_nfsv4@
 enable_nfsv41 = @enable_nfsv41@
 exec_prefix = @exec_prefix@
 enable_nfsv4 = @enable_nfsv4@
 enable_nfsv41 = @enable_nfsv41@
 exec_prefix = @exec_prefix@


@@ -224,6 +224,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 startstatd = @startstatd@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 startstatd = @startstatd@

+statdpath = @statdpath@

 statduser = @statduser@
 statedir = @statedir@
 sysconfdir = @sysconfdir@
 statduser = @statduser@
 statedir = @statedir@
 sysconfdir = @sysconfdir@