]> git.decadent.org.uk Git - nfs-utils.git/commitdiff
proper merge debian/1%1.2.6-1
authorLuk Claes <luk@debian.org>
Fri, 25 May 2012 20:20:09 +0000 (22:20 +0200)
committerLuk Claes <luk@debian.org>
Fri, 25 May 2012 20:20:09 +0000 (22:20 +0200)
42 files changed:
Makefile.in
aclocal/kerberos5.m4
configure
linux-nfs/Makefile.in
support/Makefile.in
support/export/Makefile.in
support/include/Makefile.in
support/include/nfs/Makefile.in
support/include/rpcsvc/Makefile.in
support/include/sys/Makefile.in
support/include/sys/fs/Makefile.in
support/misc/Makefile.in
support/nfs/Makefile.in
support/nsm/Makefile.in
tests/Makefile.in
tests/nsm_client/Makefile.in
tools/Makefile.in
tools/locktest/Makefile.in
tools/mountstats/Makefile.in
tools/nfs-iostat/Makefile.in
tools/nlmtest/Makefile.in
tools/rpcdebug/Makefile.in
tools/rpcgen/Makefile.in
utils/Makefile.in
utils/exportfs/Makefile.in
utils/exportfs/nfsd.man
utils/gssd/Makefile.in
utils/gssd/gss_util.c
utils/gssd/gssd_proc.c
utils/idmapd/Makefile.in
utils/mount/Makefile.in
utils/mount/fstab.c
utils/mount/fstab.h
utils/mount/mount.c
utils/mount/mount.nfs.man
utils/mountd/Makefile.in
utils/nfsd/Makefile.in
utils/nfsd/nfsd.man
utils/nfsstat/Makefile.in
utils/showmount/Makefile.in
utils/statd/Makefile.in
utils/statd/statd.c

index eeb46ace8af4c876a9734753dbbd947051f6c55e..c6c61cbedcd5cb8ede8dec2a1a32f732b9ca18d8 100644 (file)
@@ -48,12 +48,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 \
@@ -179,12 +175,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@
@@ -249,7 +250,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@
@@ -279,6 +279,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@
index 5ab1014ed8da4d19c66a80f20580370eb95aeaf2..7574e2d3b380b22b63908f8586d22e76a2a5bc5b 100644 (file)
@@ -29,7 +29,6 @@ AC_DEFUN([AC_KERBEROS_V5],[
     elif test -f "/usr/lib/mit/bin/krb5-config"; then
       K5CONFIG="/usr/lib/mit/bin/krb5-config"
     fi
     elif test -f "/usr/lib/mit/bin/krb5-config"; then
       K5CONFIG="/usr/lib/mit/bin/krb5-config"
     fi
-    MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null || true`
     if test "$K5CONFIG" != ""; then
       KRBCFLAGS=`$K5CONFIG --cflags`
       KRBLIBS=`$K5CONFIG --libs`
     if test "$K5CONFIG" != ""; then
       KRBCFLAGS=`$K5CONFIG --cflags`
       KRBLIBS=`$K5CONFIG --libs`
@@ -39,7 +38,6 @@ AC_DEFUN([AC_KERBEROS_V5],[
                 \( -f $dir/lib/libgssapi_krb5.a -o \
                    -f $dir/lib64/libgssapi_krb5.a -o \
                    -f $dir/lib64/libgssapi_krb5.so -o \
                 \( -f $dir/lib/libgssapi_krb5.a -o \
                    -f $dir/lib64/libgssapi_krb5.a -o \
                    -f $dir/lib64/libgssapi_krb5.so -o \
-                   -f $dir/lib/$MULTIARCH/libgssapi_krb5.so -o \
                    -f $dir/lib/libgssapi_krb5.so \) ; then
          AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries])
          KRBDIR="$dir"
                    -f $dir/lib/libgssapi_krb5.so \) ; then
          AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries])
          KRBDIR="$dir"
index 6378ae8bd4630dd03a03979fce1ad387e050a525..33c347e78801994f4af3db1f6a5a5e4a7f68dcc7 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for linux nfs-utils 1.2.4.
+# Generated by GNU Autoconf 2.68 for linux nfs-utils 1.2.6.
 #
 # Report bugs to <linux-nfs@vger.kernel.org>.
 #
 #
 # Report bugs to <linux-nfs@vger.kernel.org>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='linux nfs-utils'
 PACKAGE_TARNAME='nfs-utils'
 # Identity of this package.
 PACKAGE_NAME='linux nfs-utils'
 PACKAGE_TARNAME='nfs-utils'
-PACKAGE_VERSION='1.2.4'
-PACKAGE_STRING='linux nfs-utils 1.2.4'
+PACKAGE_VERSION='1.2.6'
+PACKAGE_STRING='linux nfs-utils 1.2.6'
 PACKAGE_BUGREPORT='linux-nfs@vger.kernel.org'
 PACKAGE_URL=''
 
 PACKAGE_BUGREPORT='linux-nfs@vger.kernel.org'
 PACKAGE_URL=''
 
@@ -632,10 +632,13 @@ KRBDIR
 LIBMOUNT
 CONFIG_LIBMOUNT_FALSE
 CONFIG_LIBMOUNT_TRUE
 LIBMOUNT
 CONFIG_LIBMOUNT_FALSE
 CONFIG_LIBMOUNT_TRUE
+LIBDL
 LIBBLKID
 LIBBSD
 LIBCRYPT
 LIBSOCKET
 LIBBLKID
 LIBBSD
 LIBCRYPT
 LIBSOCKET
+CONFIG_NFSIDMAP_FALSE
+CONFIG_NFSIDMAP_TRUE
 RPCSECGSS_LIBS
 RPCSECGSS_CFLAGS
 GSSGLUE_LIBS
 RPCSECGSS_LIBS
 RPCSECGSS_CFLAGS
 GSSGLUE_LIBS
@@ -643,9 +646,14 @@ GSSGLUE_CFLAGS
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
+CONFIG_NFSDCLD_FALSE
+CONFIG_NFSDCLD_TRUE
+CONFIG_SQLITE3_FALSE
+CONFIG_SQLITE3_TRUE
+LIBSQLITE
 LIBKEYUTILS
 LIBKEYUTILS
-CONFIG_NFSIDMAP_FALSE
-CONFIG_NFSIDMAP_TRUE
+LIBNFSIDMAP
+LIBEVENT
 LIBNSL
 CC_FOR_BUILD
 CXXCPP
 LIBNSL
 CC_FOR_BUILD
 CXXCPP
@@ -678,6 +686,7 @@ HAVE_TCP_WRAPPER
 HAVE_LIBWRAP
 LIBWRAP
 LIBCAP
 HAVE_LIBWRAP
 LIBWRAP
 LIBCAP
+LIBTIRPC
 EGREP
 GREP
 CPP
 EGREP
 GREP
 CPP
@@ -723,9 +732,9 @@ CONFIG_NFSV4_FALSE
 CONFIG_NFSV4_TRUE
 enable_nfsv4
 IDMAPD
 CONFIG_NFSV4_TRUE
 enable_nfsv4
 IDMAPD
-enable_nfsv3
 startstatd
 statduser
 startstatd
 statduser
+statdpath
 statedir
 RELEASE
 MAINT
 statedir
 RELEASE
 MAINT
@@ -806,9 +815,9 @@ enable_option_checking
 enable_maintainer_mode
 with_release
 with_statedir
 enable_maintainer_mode
 with_release
 with_statedir
+with_statdpath
 with_statduser
 with_start_statd
 with_statduser
 with_start_statd
-enable_nfsv3
 enable_nfsv4
 enable_nfsv41
 enable_gss
 enable_nfsv4
 enable_nfsv41
 enable_gss
@@ -821,6 +830,7 @@ enable_tirpc
 enable_ipv6
 enable_mountconfig
 with_mountfile
 enable_ipv6
 enable_mountconfig
 with_mountfile
+enable_nfsdcld
 with_tirpcinclude
 enable_dependency_tracking
 enable_caps
 with_tirpcinclude
 enable_dependency_tracking
 enable_caps
@@ -1397,7 +1407,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures linux nfs-utils 1.2.4 to adapt to many kinds of systems.
+\`configure' configures linux nfs-utils 1.2.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1467,7 +1477,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of linux nfs-utils 1.2.4:";;
+     short | recursive ) echo "Configuration of linux nfs-utils 1.2.6:";;
    esac
   cat <<\_ACEOF
 
    esac
   cat <<\_ACEOF
 
@@ -1477,18 +1487,19 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-maintainer-mode  enable make rules and dependencies not useful
                          (and sometimes confusing) to the casual installer
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-maintainer-mode  enable make rules and dependencies not useful
                          (and sometimes confusing) to the casual installer
-  --enable-nfsv3          enable support for NFSv3 [default=yes]
   --enable-nfsv4          enable support for NFSv4 [default=yes]
   --enable-nfsv4          enable support for NFSv4 [default=yes]
-  --enable-nfsv41         enable support for NFSv41 [default=no]
+  --enable-nfsv41         enable support for NFSv41 [default=yes]
   --enable-gss            enable support for rpcsec_gss [default=yes]
   --enable-kprefix        install progs as rpc.knfsd etc
   --disable-uuid          Exclude uuid support to avoid buggy libblkid
   --enable-gss            enable support for rpcsec_gss [default=yes]
   --enable-kprefix        install progs as rpc.knfsd etc
   --disable-uuid          Exclude uuid support to avoid buggy libblkid
-  --enable-mount          Create mount.nfs and don't use the util-linux
+  --enable-mount          Create mount.nfs and do not use the util-linux
                           mount(8) functionality. [default=yes]
   --enable-libmount-mount Link mount.nfs with libmount (EXPERIMENTAL)
   --enable-tirpc          enable use of TI-RPC [default=yes]
   --enable-ipv6           enable support for IPv6 [default=no]
   --enable-mountconfig    enable mount to use a configuration file
                           mount(8) functionality. [default=yes]
   --enable-libmount-mount Link mount.nfs with libmount (EXPERIMENTAL)
   --enable-tirpc          enable use of TI-RPC [default=yes]
   --enable-ipv6           enable support for IPv6 [default=no]
   --enable-mountconfig    enable mount to use a configuration file
+  --enable-nfsdcld        Create nfsdcld NFSv4 clientid tracking daemon.
+                          [default=no]
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --disable-caps          Disable capabilities support
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --disable-caps          Disable capabilities support
@@ -1503,7 +1514,9 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-release=XXX      set release to XXX [1]
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-release=XXX      set release to XXX [1]
-  --with-statedir=/foo    use state dir /foo /var/lib/nfs
+  --with-statedir=/foo    use state dir /foo [default=/var/lib/nfs]
+  --with-statdpath=/foo   define the statd state dir as /foo instead of the
+                          NFS statedir [default=/var/lib/nfs]
   --with-statduser=rpcuser
                           statd to run under [rpcuser or nobody]
   --with-start-statd=scriptname
   --with-statduser=rpcuser
                           statd to run under [rpcuser or nobody]
   --with-start-statd=scriptname
@@ -1615,7 +1628,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-linux nfs-utils configure 1.2.4
+linux nfs-utils configure 1.2.6
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2102,52 +2115,6 @@ fi
 
 } # ac_fn_cxx_try_link
 
 
 } # ac_fn_cxx_try_link
 
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ---------------------------------------------
-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
-ac_fn_c_check_decl ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  as_decl_name=`echo $2|sed 's/ *(.*//'`
-  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-#ifndef $as_decl_name
-#ifdef __cplusplus
-  (void) $as_decl_use;
-#else
-  (void) $as_decl_name;
-#endif
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_decl
-
 # ac_fn_c_check_type LINENO TYPE VAR INCLUDES
 # -------------------------------------------
 # Tests whether TYPE exists after having included INCLUDES, setting cache
 # ac_fn_c_check_type LINENO TYPE VAR INCLUDES
 # -------------------------------------------
 # Tests whether TYPE exists after having included INCLUDES, setting cache
@@ -2383,7 +2350,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by linux nfs-utils $as_me 1.2.4, which was
+It was created by linux nfs-utils $as_me 1.2.6, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3270,7 +3237,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='nfs-utils'
 
 # Define the identity of the package.
  PACKAGE='nfs-utils'
- VERSION='1.2.4'
+ VERSION='1.2.6'
 
 
 cat >>confdefs.h <<_ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3355,6 +3322,16 @@ fi
 
 
 
 
 
 
+# Check whether --with-statdpath was given.
+if test "${with_statdpath+set}" = set; then :
+  withval=$with_statdpath; statdpath=$withval
+else
+  statdpath=$statedir
+
+fi
+
+
+
 # Check whether --with-statduser was given.
 if test "${with_statduser+set}" = set; then :
   withval=$with_statduser; statduser=$withval
 # Check whether --with-statduser was given.
 if test "${with_statduser+set}" = set; then :
   withval=$with_statduser; statduser=$withval
@@ -3386,21 +3363,6 @@ cat >>confdefs.h <<_ACEOF
 #define START_STATD "$startstatd"
 _ACEOF
 
 #define START_STATD "$startstatd"
 _ACEOF
 
-# Check whether --enable-nfsv3 was given.
-if test "${enable_nfsv3+set}" = set; then :
-  enableval=$enable_nfsv3; enable_nfsv3=$enableval
-else
-  enable_nfsv3=yes
-fi
-
-       if test "$enable_nfsv3" = yes; then
-
-$as_echo "#define NFS3_SUPPORTED 1" >>confdefs.h
-
-       else
-               enable_nfsv3=
-       fi
-
 # Check whether --enable-nfsv4 was given.
 if test "${enable_nfsv4+set}" = set; then :
   enableval=$enable_nfsv4; enable_nfsv4=$enableval
 # Check whether --enable-nfsv4 was given.
 if test "${enable_nfsv4+set}" = set; then :
   enableval=$enable_nfsv4; enable_nfsv4=$enableval
@@ -3409,9 +3371,6 @@ else
 fi
 
        if test "$enable_nfsv4" = yes; then
 fi
 
        if test "$enable_nfsv4" = yes; then
-
-$as_echo "#define NFS4_SUPPORTED 1" >>confdefs.h
-
                IDMAPD=idmapd
        else
                enable_nfsv4=
                IDMAPD=idmapd
        else
                enable_nfsv4=
@@ -3432,15 +3391,17 @@ fi
 if test "${enable_nfsv41+set}" = set; then :
   enableval=$enable_nfsv41; enable_nfsv41=$enableval
 else
 if test "${enable_nfsv41+set}" = set; then :
   enableval=$enable_nfsv41; enable_nfsv41=$enableval
 else
-  enable_nfsv41=no
+  enable_nfsv41=yes
 fi
 
        if test "$enable_nfsv41" = yes; then
 fi
 
        if test "$enable_nfsv41" = yes; then
-
-$as_echo "#define NFS41_SUPPORTED 1" >>confdefs.h
-
+               if test "$enable_nfsv4" != yes; then
+                       as_fn_error $? "NFS v4.1 is enabled but NFS v4 is not. Use --disable-nfsv41" "$LINENO" 5
+               fi
+               BLKMAPD=blkmapd
        else
                enable_nfsv41=
        else
                enable_nfsv41=
+               BLKMAPD=
        fi
 
         if test "$enable_nfsv41" = "yes"; then
        fi
 
         if test "$enable_nfsv41" = "yes"; then
@@ -3460,9 +3421,6 @@ else
 fi
 
        if test "$enable_gss" = yes; then
 fi
 
        if test "$enable_gss" = yes; then
-
-$as_echo "#define GSS_SUPPORTED 1" >>confdefs.h
-
                GSSD=gssd
                SVCGSSD=svcgssd
        else
                GSSD=gssd
                SVCGSSD=svcgssd
        else
@@ -3498,14 +3456,14 @@ else
 fi
 
        RPCGEN_PATH=
 fi
 
        RPCGEN_PATH=
-       if test "$rpcgen_path" == "yes"; then
+       if test "$rpcgen_path" = "yes"; then
            for p in /usr/local/bin/rpcgen /usr/bin/rpcgen /bin/rpcgen
            do if test -f $p ; then RPCGEN_PATH=$p ; break; fi ; done
        elif test "$rpcgen_path" != "internal"; then
            RPCGEN_PATH=$rpcgen_path
        fi
 
            for p in /usr/local/bin/rpcgen /usr/bin/rpcgen /bin/rpcgen
            do if test -f $p ; then RPCGEN_PATH=$p ; break; fi ; done
        elif test "$rpcgen_path" != "internal"; then
            RPCGEN_PATH=$rpcgen_path
        fi
 
-        if test "$RPCGEN_PATH" == ""; then
+        if test "$RPCGEN_PATH" = ""; then
   CONFIG_RPCGEN_TRUE=
   CONFIG_RPCGEN_FALSE='#'
 else
   CONFIG_RPCGEN_TRUE=
   CONFIG_RPCGEN_FALSE='#'
 else
@@ -3539,7 +3497,7 @@ fi
 if test "$enable_mount" = yes; then
        # Check whether --enable-libmount-mount was given.
 if test "${enable_libmount_mount+set}" = set; then :
 if test "$enable_mount" = yes; then
        # Check whether --enable-libmount-mount was given.
 if test "${enable_libmount_mount+set}" = set; then :
-  enableval=$enable_libmount_mount; enable_libmount=yes
+  enableval=$enable_libmount_mount; enable_libmount=$enableval
 else
   enable_libmount=no
 fi
 else
   enable_libmount=no
 fi
@@ -3626,6 +3584,14 @@ fi
 
 fi
 
 
 fi
 
+# Check whether --enable-nfsdcld was given.
+if test "${enable_nfsdcld+set}" = set; then :
+  enableval=$enable_nfsdcld; enable_nfsdcld=$enableval
+else
+  enable_nfsdcld="no"
+fi
+
+
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -5054,12 +5020,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tirpc_clnt_tli_create" >&5
 $as_echo "$ac_cv_lib_tirpc_clnt_tli_create" >&6; }
 if test "x$ac_cv_lib_tirpc_clnt_tli_create" = xyes; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tirpc_clnt_tli_create" >&5
 $as_echo "$ac_cv_lib_tirpc_clnt_tli_create" >&6; }
 if test "x$ac_cv_lib_tirpc_clnt_tli_create" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBTIRPC 1
-_ACEOF
-
-  LIBS="-ltirpc $LIBS"
-
+  :
 else
   if test "$enable_tirpc" = "yes"; then
                        as_fn_error $? "libtirpc not found." "$LINENO" 5
 else
   if test "$enable_tirpc" = "yes"; then
                        as_fn_error $? "libtirpc not found." "$LINENO" 5
@@ -5098,6 +5059,17 @@ done
 
   fi
 
 
   fi
 
+    if test "$enable_tirpc" != "no"; then
+
+$as_echo "#define HAVE_LIBTIRPC 1" >>confdefs.h
+
+    LIBTIRPC="-ltirpc"
+  else
+    LIBTIRPC=""
+  fi
+
+
+
 
 
 
 
 
 
@@ -10220,10 +10192,6 @@ _lt_linker_boilerplate=`cat conftest.err`
 $RM -r conftest*
 
 
 $RM -r conftest*
 
 
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
 if test -n "$compiler"; then
 
 lt_prog_compiler_no_builtin_flag=
 if test -n "$compiler"; then
 
 lt_prog_compiler_no_builtin_flag=
@@ -17637,6 +17605,47 @@ if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
 fi
 
 
 fi
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlclose in -ldl" >&5
+$as_echo_n "checking for dlclose in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlclose+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlclose ();
+int
+main ()
+{
+return dlclose ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlclose=yes
+else
+  ac_cv_lib_dl_dlclose=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlclose" >&5
+$as_echo "$ac_cv_lib_dl_dlclose" >&6; }
+if test "x$ac_cv_lib_dl_dlclose" = xyes; then :
+  LIBDL="-ldl"
+fi
+
+
 if test "$enable_nfsv4" = yes; then
 
 
 if test "$enable_nfsv4" = yes; then
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_event_event_dispatch" >&5
 $as_echo "$ac_cv_lib_event_event_dispatch" >&6; }
 if test "x$ac_cv_lib_event_event_dispatch" = xyes; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_event_event_dispatch" >&5
 $as_echo "$ac_cv_lib_event_event_dispatch" >&6; }
 if test "x$ac_cv_lib_event_event_dispatch" = xyes; then :
-  libevent=1
+  LIBEVENT=-levent
 else
   as_fn_error $? "libevent not found." "$LINENO" 5
 fi
 
 
 else
   as_fn_error $? "libevent not found." "$LINENO" 5
 fi
 
 
+
   for ac_header in event.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "event.h" "ac_cv_header_event_h" "$ac_includes_default"
   for ac_header in event.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "event.h" "ac_cv_header_event_h" "$ac_includes_default"
@@ -17739,7 +17749,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nfsidmap_nfs4_init_name_mapping" >&5
 $as_echo "$ac_cv_lib_nfsidmap_nfs4_init_name_mapping" >&6; }
 if test "x$ac_cv_lib_nfsidmap_nfs4_init_name_mapping" = xyes; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nfsidmap_nfs4_init_name_mapping" >&5
 $as_echo "$ac_cv_lib_nfsidmap_nfs4_init_name_mapping" >&6; }
 if test "x$ac_cv_lib_nfsidmap_nfs4_init_name_mapping" = xyes; then :
-  libnfsidmap=1
+  LIBNFSIDMAP=-lnfsidmap
 else
   as_fn_error $? "libnfsidmap not found." "$LINENO" 5
 fi
 else
   as_fn_error $? "libnfsidmap not found." "$LINENO" 5
 fi
@@ -17803,7 +17813,7 @@ $as_echo "#define HAVE_NFS4_SET_DEBUG 1" >>confdefs.h
 fi
 
 
 fi
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nfs4_owner_to_uid in -lnfsidmap" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nfs4_owner_to_uid in -lnfsidmap" >&5
 $as_echo_n "checking for nfs4_owner_to_uid in -lnfsidmap... " >&6; }
 if ${ac_cv_lib_nfsidmap_nfs4_owner_to_uid+:} false; then :
   $as_echo_n "(cached) " >&6
 $as_echo_n "checking for nfs4_owner_to_uid in -lnfsidmap... " >&6; }
 if ${ac_cv_lib_nfsidmap_nfs4_owner_to_uid+:} false; then :
   $as_echo_n "(cached) " >&6
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nfsidmap_nfs4_owner_to_uid" >&5
 $as_echo "$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" >&6; }
 if test "x$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = xyes; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nfsidmap_nfs4_owner_to_uid" >&5
 $as_echo "$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" >&6; }
 if test "x$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = xyes; then :
-  enable_nfsidmap=yes
-else
-  enable_nfsidmap=no
+  :
 fi
 
 
 
 
 fi
 
 
 
 
-     if test "$enable_nfsidmap" = "yes"; then
-  CONFIG_NFSIDMAP_TRUE=
-  CONFIG_NFSIDMAP_FALSE='#'
-else
-  CONFIG_NFSIDMAP_TRUE='#'
-  CONFIG_NFSIDMAP_FALSE=
-fi
 
 
 
 
 
 
@@ -17909,13 +17910,150 @@ if test "x$ac_cv_header_keyutils_h" = xyes; then :
 #define HAVE_KEYUTILS_H 1
 _ACEOF
 
 #define HAVE_KEYUTILS_H 1
 _ACEOF
 
+fi
+
+done
+
+
+
+
+
+  for ac_header in sqlite3.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default"
+if test "x$ac_cv_header_sqlite3_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SQLITE3_H 1
+_ACEOF
+
+fi
+
+done
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_libversion_number in -lsqlite3" >&5
+$as_echo_n "checking for sqlite3_libversion_number in -lsqlite3... " >&6; }
+if ${ac_cv_lib_sqlite3_sqlite3_libversion_number+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsqlite3  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sqlite3_libversion_number ();
+int
+main ()
+{
+return sqlite3_libversion_number ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_sqlite3_sqlite3_libversion_number=yes
 else
 else
-  as_fn_error $? "keyutils.h header not found." "$LINENO" 5
+  ac_cv_lib_sqlite3_sqlite3_libversion_number=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_libversion_number" >&5
+$as_echo "$ac_cv_lib_sqlite3_sqlite3_libversion_number" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_libversion_number" = xyes; then :
+  LIBSQLITE=-lsqlite3
+fi
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suitable sqlite3 version" >&5
+$as_echo_n "checking for suitable sqlite3 version... " >&6; }
+
+  if ${libsqlite3_cv_is_recent+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    saved_LIBS="$LIBS"
+    LIBS=-lsqlite3
+    if test "$cross_compiling" = yes; then :
+  libsqlite3_cv_is_recent=unknown
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+       #include <stdio.h>
+       #include <sqlite3.h>
+       int main()
+       {
+               int vers = sqlite3_libversion_number();
+
+               return vers != SQLITE_VERSION_NUMBER ||
+                       vers < 3003000;
+       }
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  libsqlite3_cv_is_recent=yes
+else
+  libsqlite3_cv_is_recent=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+    LIBS="$saved_LIBS"
+fi
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libsqlite3_cv_is_recent" >&5
+$as_echo "$libsqlite3_cv_is_recent" >&6; }
+   if test "$libsqlite3_cv_is_recent" = "yes"; then
+  CONFIG_SQLITE3_TRUE=
+  CONFIG_SQLITE3_FALSE='#'
+else
+  CONFIG_SQLITE3_TRUE='#'
+  CONFIG_SQLITE3_FALSE=
+fi
+
+
+
+  if test "$enable_nfsdcld" = "yes"; then
+       for ac_header in libgen.h sys/inotify.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+else
+  as_fn_error $? "Cannot find header needed for nfsdcld" "$LINENO" 5
 fi
 
 done
 
 
 fi
 
 done
 
 
+       if test "$libsqlite3_cv_is_recent" != "yes" ; then
+               as_fn_error $? "nfsdcld requires sqlite3" "$LINENO" 5
+       fi
+  fi
+
+   if test "$enable_nfsdcld" = "yes" ; then
+  CONFIG_NFSDCLD_TRUE=
+  CONFIG_NFSDCLD_FALSE='#'
+else
+  CONFIG_NFSDCLD_TRUE='#'
+  CONFIG_NFSDCLD_FALSE=
+fi
+
 
       if test "$enable_gss" = yes; then
 
 
       if test "$enable_gss" = yes; then
 
@@ -18048,12 +18186,12 @@ if test -n "$GSSGLUE_CFLAGS"; then
     pkg_cv_GSSGLUE_CFLAGS="$GSSGLUE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     pkg_cv_GSSGLUE_CFLAGS="$GSSGLUE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgssglue >= 0.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libgssglue >= 0.1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgssglue >= 0.3\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libgssglue >= 0.3") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GSSGLUE_CFLAGS=`$PKG_CONFIG --cflags "libgssglue >= 0.1" 2>/dev/null`
+  pkg_cv_GSSGLUE_CFLAGS=`$PKG_CONFIG --cflags "libgssglue >= 0.3" 2>/dev/null`
 else
   pkg_failed=yes
 fi
 else
   pkg_failed=yes
 fi
@@ -18064,12 +18202,12 @@ if test -n "$GSSGLUE_LIBS"; then
     pkg_cv_GSSGLUE_LIBS="$GSSGLUE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     pkg_cv_GSSGLUE_LIBS="$GSSGLUE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgssglue >= 0.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libgssglue >= 0.1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgssglue >= 0.3\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libgssglue >= 0.3") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GSSGLUE_LIBS=`$PKG_CONFIG --libs "libgssglue >= 0.1" 2>/dev/null`
+  pkg_cv_GSSGLUE_LIBS=`$PKG_CONFIG --libs "libgssglue >= 0.3" 2>/dev/null`
 else
   pkg_failed=yes
 fi
 else
   pkg_failed=yes
 fi
@@ -18089,14 +18227,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-               GSSGLUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgssglue >= 0.1" 2>&1`
+               GSSGLUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgssglue >= 0.3" 2>&1`
         else
         else
-               GSSGLUE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgssglue >= 0.1" 2>&1`
+               GSSGLUE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgssglue >= 0.3" 2>&1`
         fi
        # Put the nasty error message in config.log where it belongs
        echo "$GSSGLUE_PKG_ERRORS" >&5
 
         fi
        # Put the nasty error message in config.log where it belongs
        echo "$GSSGLUE_PKG_ERRORS" >&5
 
-       as_fn_error $? "Package requirements (libgssglue >= 0.1) were not met:
+       as_fn_error $? "Package requirements (libgssglue >= 0.3) were not met:
 
 $GSSGLUE_PKG_ERRORS
 
 
 $GSSGLUE_PKG_ERRORS
 
   fi
 fi
 
   fi
 fi
 
+if test "$enable_nfsv41" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dm_task_create in -ldevmapper" >&5
+$as_echo_n "checking for dm_task_create in -ldevmapper... " >&6; }
+if ${ac_cv_lib_devmapper_dm_task_create+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldevmapper  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dm_task_create ();
+int
+main ()
+{
+return dm_task_create ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_devmapper_dm_task_create=yes
+else
+  ac_cv_lib_devmapper_dm_task_create=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_devmapper_dm_task_create" >&5
+$as_echo "$ac_cv_lib_devmapper_dm_task_create" >&6; }
+if test "x$ac_cv_lib_devmapper_dm_task_create" = xyes; then :
+  LIBDEVMAPPER="-ldevmapper"
+else
+  as_fn_error $? "libdevmapper needed" "$LINENO" 5
+fi
+
+  ac_fn_c_check_header_mongrel "$LINENO" "libdevmapper.h" "ac_cv_header_libdevmapper_h" "$ac_includes_default"
+if test "x$ac_cv_header_libdevmapper_h" = xyes; then :
+
+else
+  as_fn_error $? "Cannot find devmapper header file libdevmapper.h" "$LINENO" 5
+fi
+
+
+fi
+
+ if test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"; then
+  CONFIG_NFSIDMAP_TRUE=
+  CONFIG_NFSIDMAP_FALSE='#'
+else
+  CONFIG_NFSIDMAP_TRUE='#'
+  CONFIG_NFSIDMAP_FALSE=
+fi
+
+
+
 if test "$knfsd_cv_glibc2" = no; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for daemon in -lbsd" >&5
 $as_echo_n "checking for daemon in -lbsd... " >&6; }
 if test "$knfsd_cv_glibc2" = no; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for daemon in -lbsd" >&5
 $as_echo_n "checking for daemon in -lbsd... " >&6; }
@@ -18384,6 +18585,7 @@ fi
 
 
 
 
 
 
+
 if test "$enable_libmount" != no; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mnt_context_do_mount in -lmount" >&5
 $as_echo_n "checking for mnt_context_do_mount in -lmount... " >&6; }
 if test "$enable_libmount" != no; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mnt_context_do_mount in -lmount" >&5
 $as_echo_n "checking for mnt_context_do_mount in -lmount... " >&6; }
@@ -18494,7 +18696,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nfsidmap_nfs4_init_name_mapping" >&5
 $as_echo "$ac_cv_lib_nfsidmap_nfs4_init_name_mapping" >&6; }
 if test "x$ac_cv_lib_nfsidmap_nfs4_init_name_mapping" = xyes; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nfsidmap_nfs4_init_name_mapping" >&5
 $as_echo "$ac_cv_lib_nfsidmap_nfs4_init_name_mapping" >&6; }
 if test "x$ac_cv_lib_nfsidmap_nfs4_init_name_mapping" = xyes; then :
-  libnfsidmap=1
+  LIBNFSIDMAP=-lnfsidmap
 else
   as_fn_error $? "libnfsidmap not found." "$LINENO" 5
 fi
 else
   as_fn_error $? "libnfsidmap not found." "$LINENO" 5
 fi
@@ -18558,7 +18760,7 @@ $as_echo "#define HAVE_NFS4_SET_DEBUG 1" >>confdefs.h
 fi
 
 
 fi
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nfs4_owner_to_uid in -lnfsidmap" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nfs4_owner_to_uid in -lnfsidmap" >&5
 $as_echo_n "checking for nfs4_owner_to_uid in -lnfsidmap... " >&6; }
 if ${ac_cv_lib_nfsidmap_nfs4_owner_to_uid+:} false; then :
   $as_echo_n "(cached) " >&6
 $as_echo_n "checking for nfs4_owner_to_uid in -lnfsidmap... " >&6; }
 if ${ac_cv_lib_nfsidmap_nfs4_owner_to_uid+:} false; then :
   $as_echo_n "(cached) " >&6
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nfsidmap_nfs4_owner_to_uid" >&5
 $as_echo "$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" >&6; }
 if test "x$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = xyes; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nfsidmap_nfs4_owner_to_uid" >&5
 $as_echo "$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" >&6; }
 if test "x$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = xyes; then :
-  enable_nfsidmap=yes
-else
-  enable_nfsidmap=no
+  :
 fi
 
 
 
 
 fi
 
 
 
 
-  for ac_header in spkm3.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "spkm3.h" "ac_cv_header_spkm3_h" "$ac_includes_default"
-if test "x$ac_cv_header_spkm3_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SPKM3_H 1
-_ACEOF
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not locate SPKM3 header; will not have SPKM3 support" >&5
-$as_echo "$as_me: WARNING: Could not locate SPKM3 header; will not have SPKM3 support" >&2;}
-fi
-
-done
 
 
 
 
 
 
@@ -18649,7 +18835,7 @@ fi
     fi
     if test "$K5CONFIG" != ""; then
       KRBCFLAGS=`$K5CONFIG --cflags`
     fi
     if test "$K5CONFIG" != ""; then
       KRBCFLAGS=`$K5CONFIG --cflags`
-      KRBLIBS=`$K5CONFIG --libs gssapi`
+      KRBLIBS=`$K5CONFIG --libs`
       K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(4),v,"."); if (v["3"] == "") v["3"] = "0"; print v["1"]v["2"]v["3"] }'`
 
 cat >>confdefs.h <<_ACEOF
       K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(4),v,"."); if (v["3"] == "") v["3"] = "0"; print v["1"]v["2"]v["3"] }'`
 
 cat >>confdefs.h <<_ACEOF
 
 
 
 
 
 
-  ac_fn_c_check_decl "$LINENO" "AI_ADDRCONFIG" "ac_cv_have_decl_AI_ADDRCONFIG" " #include <netdb.h>
-"
-if test "x$ac_cv_have_decl_AI_ADDRCONFIG" = xyes; then :
-
-$as_echo "#define HAVE_DECL_AI_ADDRCONFIG 1" >>confdefs.h
-
-fi
-
-
   if test "$enable_ipv6" = yes; then
 
         if test "$enable_tirpc" = no; then
       as_fn_error $? "'--enable-ipv6' requires TIRPC support." "$LINENO" 5
     fi
 
   if test "$enable_ipv6" = yes; then
 
         if test "$enable_tirpc" = no; then
       as_fn_error $? "'--enable-ipv6' requires TIRPC support." "$LINENO" 5
     fi
 
-        for ac_func in getifaddrs getnameinfo bindresvport_sa
+        for ac_func in getifaddrs getnameinfo
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 done
 
 
 done
 
 
-            ac_fn_c_check_decl "$LINENO" "AI_ADDRCONFIG" "ac_cv_have_decl_AI_ADDRCONFIG" " #include <netdb.h>
-"
-if test "x$ac_cv_have_decl_AI_ADDRCONFIG" = xyes; then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindresvport_sa in -ltirpc" >&5
+$as_echo_n "checking for bindresvport_sa in -ltirpc... " >&6; }
+if ${ac_cv_lib_tirpc_bindresvport_sa+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ltirpc  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
 
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char bindresvport_sa ();
+int
+main ()
+{
+return bindresvport_sa ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_tirpc_bindresvport_sa=yes
 else
 else
-  as_fn_error $? "full getaddrinfo(3) implementation needed for IPv6 support" "$LINENO" 5
+  ac_cv_lib_tirpc_bindresvport_sa=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tirpc_bindresvport_sa" >&5
+$as_echo "$ac_cv_lib_tirpc_bindresvport_sa" >&6; }
+if test "x$ac_cv_lib_tirpc_bindresvport_sa" = xyes; then :
+  :
+else
+  as_fn_error $? "Missing library functions needed for IPv6." "$LINENO" 5
 fi
 fi
-
 
   fi
 
 
   fi
 
@@ -19086,7 +19296,7 @@ for ac_header in arpa/inet.h fcntl.h libintl.h limits.h \
                  stdlib.h string.h sys/file.h sys/ioctl.h sys/mount.h \
                  sys/param.h sys/socket.h sys/time.h sys/vfs.h \
                  syslog.h unistd.h com_err.h et/com_err.h \
                  stdlib.h string.h sys/file.h sys/ioctl.h sys/mount.h \
                  sys/param.h sys/socket.h sys/time.h sys/vfs.h \
                  syslog.h unistd.h com_err.h et/com_err.h \
-                 ifaddrs.h
+                 ifaddrs.h nfs-plugin.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -20913,6 +21123,11 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
 _ACEOF
 
 
+cat >>confdefs.h <<_ACEOF
+#define NSM_DEFAULT_STATEDIR "$statdpath"
+_ACEOF
+
+
 if test "x$cross_compiling" = "xno"; then
        CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-"$CFLAGS"}
        CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-"$CXXFLAGS"}
 if test "x$cross_compiling" = "xno"; then
        CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-"$CFLAGS"}
        CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-"$CXXFLAGS"}
@@ -20949,7 +21164,7 @@ AM_CFLAGS="$my_am_cflags"
 ACLOCAL_AMFLAGS="-I $ac_macro_dir \$(ACLOCAL_FLAGS)"
 
 
 ACLOCAL_AMFLAGS="-I $ac_macro_dir \$(ACLOCAL_FLAGS)"
 
 
-ac_config_files="$ac_config_files Makefile linux-nfs/Makefile support/Makefile support/export/Makefile support/include/nfs/Makefile support/include/rpcsvc/Makefile support/include/sys/fs/Makefile support/include/sys/Makefile support/include/Makefile support/misc/Makefile support/nfs/Makefile support/nsm/Makefile tools/Makefile tools/locktest/Makefile tools/nlmtest/Makefile tools/rpcdebug/Makefile tools/rpcgen/Makefile tools/mountstats/Makefile tools/nfs-iostat/Makefile utils/Makefile utils/exportfs/Makefile utils/gssd/Makefile utils/idmapd/Makefile utils/mount/Makefile utils/mountd/Makefile utils/nfsd/Makefile utils/nfsstat/Makefile utils/nfsidmap/Makefile utils/showmount/Makefile utils/statd/Makefile tests/Makefile tests/nsm_client/Makefile"
+ac_config_files="$ac_config_files Makefile linux-nfs/Makefile support/Makefile support/export/Makefile support/include/nfs/Makefile support/include/rpcsvc/Makefile support/include/sys/fs/Makefile support/include/sys/Makefile support/include/Makefile support/misc/Makefile support/nfs/Makefile support/nsm/Makefile tools/Makefile tools/locktest/Makefile tools/nlmtest/Makefile tools/rpcdebug/Makefile tools/rpcgen/Makefile tools/mountstats/Makefile tools/nfs-iostat/Makefile utils/Makefile utils/blkmapd/Makefile utils/nfsdcld/Makefile utils/exportfs/Makefile utils/gssd/Makefile utils/idmapd/Makefile utils/mount/Makefile utils/mountd/Makefile utils/nfsd/Makefile utils/nfsstat/Makefile utils/nfsidmap/Makefile utils/showmount/Makefile utils/statd/Makefile utils/osd_login/Makefile tests/Makefile tests/nsm_client/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -21120,6 +21335,14 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${CONFIG_SQLITE3_TRUE}" && test -z "${CONFIG_SQLITE3_FALSE}"; then
+  as_fn_error $? "conditional \"CONFIG_SQLITE3\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${CONFIG_NFSDCLD_TRUE}" && test -z "${CONFIG_NFSDCLD_FALSE}"; then
+  as_fn_error $? "conditional \"CONFIG_NFSDCLD\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${CONFIG_NFSIDMAP_TRUE}" && test -z "${CONFIG_NFSIDMAP_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_NFSIDMAP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 if test -z "${CONFIG_NFSIDMAP_TRUE}" && test -z "${CONFIG_NFSIDMAP_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_NFSIDMAP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -21537,7 +21760,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by linux nfs-utils $as_me 1.2.4, which was
+This file was extended by linux nfs-utils $as_me 1.2.6, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21603,7 +21826,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-linux nfs-utils config.status 1.2.4
+linux nfs-utils config.status 1.2.6
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -22132,6 +22355,8 @@ do
     "tools/mountstats/Makefile") CONFIG_FILES="$CONFIG_FILES tools/mountstats/Makefile" ;;
     "tools/nfs-iostat/Makefile") CONFIG_FILES="$CONFIG_FILES tools/nfs-iostat/Makefile" ;;
     "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;;
     "tools/mountstats/Makefile") CONFIG_FILES="$CONFIG_FILES tools/mountstats/Makefile" ;;
     "tools/nfs-iostat/Makefile") CONFIG_FILES="$CONFIG_FILES tools/nfs-iostat/Makefile" ;;
     "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;;
+    "utils/blkmapd/Makefile") CONFIG_FILES="$CONFIG_FILES utils/blkmapd/Makefile" ;;
+    "utils/nfsdcld/Makefile") CONFIG_FILES="$CONFIG_FILES utils/nfsdcld/Makefile" ;;
     "utils/exportfs/Makefile") CONFIG_FILES="$CONFIG_FILES utils/exportfs/Makefile" ;;
     "utils/gssd/Makefile") CONFIG_FILES="$CONFIG_FILES utils/gssd/Makefile" ;;
     "utils/idmapd/Makefile") CONFIG_FILES="$CONFIG_FILES utils/idmapd/Makefile" ;;
     "utils/exportfs/Makefile") CONFIG_FILES="$CONFIG_FILES utils/exportfs/Makefile" ;;
     "utils/gssd/Makefile") CONFIG_FILES="$CONFIG_FILES utils/gssd/Makefile" ;;
     "utils/idmapd/Makefile") CONFIG_FILES="$CONFIG_FILES utils/idmapd/Makefile" ;;
@@ -22142,6 +22367,7 @@ do
     "utils/nfsidmap/Makefile") CONFIG_FILES="$CONFIG_FILES utils/nfsidmap/Makefile" ;;
     "utils/showmount/Makefile") CONFIG_FILES="$CONFIG_FILES utils/showmount/Makefile" ;;
     "utils/statd/Makefile") CONFIG_FILES="$CONFIG_FILES utils/statd/Makefile" ;;
     "utils/nfsidmap/Makefile") CONFIG_FILES="$CONFIG_FILES utils/nfsidmap/Makefile" ;;
     "utils/showmount/Makefile") CONFIG_FILES="$CONFIG_FILES utils/showmount/Makefile" ;;
     "utils/statd/Makefile") CONFIG_FILES="$CONFIG_FILES utils/statd/Makefile" ;;
+    "utils/osd_login/Makefile") CONFIG_FILES="$CONFIG_FILES utils/osd_login/Makefile" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
     "tests/nsm_client/Makefile") CONFIG_FILES="$CONFIG_FILES tests/nsm_client/Makefile" ;;
 
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
     "tests/nsm_client/Makefile") CONFIG_FILES="$CONFIG_FILES tests/nsm_client/Makefile" ;;
 
index f04fdc009d0cf07ada822eb8e9ac52a03e52710d..626ddbec11bf5e6ef39cf43cd4f4b05e4986215f 100644 (file)
@@ -46,12 +46,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 \
@@ -125,12 +121,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@
@@ -195,7 +196,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@
@@ -225,6 +225,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@
index 581108a39524fb888d66e2a4c2a65cff1246d29e..79c05cb1900ab29607602ca2baafb42dce1ab392 100644 (file)
@@ -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 \
@@ -164,12 +160,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@
@@ -234,7 +235,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@
@@ -264,6 +264,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@
index c2fc14a7e59320c553e1dd74e934f27e458ee741..566d4b0cecee2fa53e144c94d7fff13dca429005 100644 (file)
@@ -48,12 +48,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 \
@@ -151,12 +147,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@
@@ -221,7 +222,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@
@@ -251,6 +251,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@
index e73b4faa44e4b277e8bc3b7e1233e089739b61ce..60e9543729d09961571402c22604b63aa60284cb 100644 (file)
@@ -47,12 +47,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 \
@@ -167,12 +163,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@
@@ -237,7 +238,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@
@@ -267,6 +267,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@
index fc7beb060210fccca4e230a4d39efca7620e7166..6e033c4aa750fb15b8cb85668b3bd6dce039f30b 100644 (file)
@@ -47,12 +47,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 \
@@ -129,12 +125,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@
@@ -199,7 +200,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@
@@ -229,6 +229,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@
index 6912cf2b5bb24eb417862e0b701e67b0fe687db8..671ef75eb8fb7de0cd4f7a74aa961faffa3c3e8f 100644 (file)
@@ -47,12 +47,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 \
@@ -129,12 +125,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@
@@ -199,7 +200,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@
@@ -229,6 +229,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@
index 297ebe872714798e85993d05102f01eb5eb7355b..e6bdc08089437bddb681999bc8e9d7c948ed6b89 100644 (file)
@@ -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 \
@@ -164,12 +160,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@
@@ -234,7 +235,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@
@@ -264,6 +264,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@
index 8c20c9fff1e24872e413309344bf1c7e8566e1b1..d4f4e43df5018c5a410d1ac65c80c8756c9332e1 100644 (file)
@@ -47,12 +47,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 \
@@ -129,12 +125,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@
@@ -199,7 +200,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@
@@ -229,6 +229,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@
index eea24a4c8e56534a1d412ca76f76ccaa3fb2bfd1..c9780925c3f85e001834b3c48822a94976445950 100644 (file)
@@ -46,12 +46,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 \
@@ -147,12 +143,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@
@@ -217,7 +218,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@
@@ -247,6 +247,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@
index 852e2198eb618b0eb3288e807335f39b5b748ed0..c8589ae809e07d6088dc02d0bbf203102e9b404e 100644 (file)
@@ -46,12 +46,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 \
@@ -153,12 +149,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@
@@ -223,7 +224,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@
@@ -253,6 +253,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@
index c05244975835043cbea1bcc3e8d491575867957d..c2dda2050f0deccda4c7d7cdd6dded10cb4cee15 100644 (file)
@@ -46,12 +46,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 \
@@ -152,12 +148,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@
@@ -222,7 +223,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@
@@ -252,6 +252,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@
index 0f0e2dad993a04a454a8a4c9f31bd7d5ccb6f111..919dd2468f0809d02098fee2dd73dfc6b567a64e 100644 (file)
@@ -46,12 +46,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 \
@@ -185,12 +181,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@
@@ -255,7 +256,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@
@@ -285,6 +285,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@
index e8a637fa630bda9cdd9ca149c5782643c0b10ba3..b18b35bba5b379a5a3e15604ad07f46e13bdec1d 100644 (file)
@@ -46,12 +46,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 \
@@ -151,12 +147,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@
@@ -221,7 +222,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@
@@ -251,6 +251,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@
index 335958d8193456d30dd80f8de03e9c38ecd045ab..8099b0b4281df91d3ca6bca0b57133bc4aaeb8a3 100644 (file)
@@ -46,12 +46,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 \
@@ -165,12 +161,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@
@@ -235,7 +236,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@
@@ -265,6 +265,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@
index e54d0e452ef30e0b2d2353c1d227961ba708fd89..9dbe03f00804980fbcd3f60378dfd8f3741a84d6 100644 (file)
@@ -47,12 +47,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 \
@@ -148,12 +144,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@ --tag=CC
 LIBWRAP = @LIBWRAP@
 LIPO = @LIPO@
 LIBTOOL = @LIBTOOL@ --tag=CC
 LIBWRAP = @LIBWRAP@
 LIPO = @LIPO@
@@ -218,7 +219,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@
@@ -248,6 +248,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@
index ec2fada3c44dd4c9f1c3695404205ab7b432aea0..2d24665d6d4bc18326b558f9849fb3cee84340c9 100644 (file)
@@ -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 \
@@ -149,12 +145,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@
@@ -219,7 +220,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@
@@ -249,6 +249,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@
index 4ab9f13ed1d3756a8f65254285dde5bf37390112..aded8f5c4b8ad39f9488033b8f84526080f732a4 100644 (file)
@@ -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 \
@@ -149,12 +145,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@
@@ -219,7 +220,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@
@@ -249,6 +249,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@
index 69173430dc487869b7efda1c82dd0d1cb039679b..68e84744d263f19ec2fa2dfb79ef11b01230f358 100644 (file)
@@ -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@
index e79bbc87c04d7db9c2473a60a1abda762daa5fc9..0cd5c5737ae9cddfe704846ca1769510680cc47e 100644 (file)
@@ -47,12 +47,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 \
@@ -173,12 +169,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@ --tag=CC
 LIBWRAP = @LIBWRAP@
 LIPO = @LIPO@
 LIBTOOL = @LIBTOOL@ --tag=CC
 LIBWRAP = @LIBWRAP@
 LIPO = @LIPO@
@@ -243,7 +244,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@
@@ -273,6 +273,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@
index 96c66c14b2bdd812b2d4256a1abc6a68972305d4..c1821eb38e6c0c48cf4f07e1c156578743f6a440 100644 (file)
@@ -47,12 +47,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 \
@@ -71,7 +67,8 @@ am_rpcgen_OBJECTS = rpcgen-rpc_clntout.$(OBJEXT) \
        rpcgen-rpc_tblout.$(OBJEXT) rpcgen-rpc_util.$(OBJEXT) \
        rpcgen-rpc_sample.$(OBJEXT)
 rpcgen_OBJECTS = $(am_rpcgen_OBJECTS)
        rpcgen-rpc_tblout.$(OBJEXT) rpcgen-rpc_util.$(OBJEXT) \
        rpcgen-rpc_sample.$(OBJEXT)
 rpcgen_OBJECTS = $(am_rpcgen_OBJECTS)
-rpcgen_LDADD = $(LDADD)
+am__DEPENDENCIES_1 =
+rpcgen_DEPENDENCIES = $(am__DEPENDENCIES_1)
 rpcgen_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CCLD) $(rpcgen_CFLAGS) $(CFLAGS) \
        $(rpcgen_LDFLAGS) $(LDFLAGS) -o $@
 rpcgen_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CCLD) $(rpcgen_CFLAGS) $(CFLAGS) \
        $(rpcgen_LDFLAGS) $(LDFLAGS) -o $@
@@ -153,12 +150,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@ --tag=CC
 LIBWRAP = @LIBWRAP@
 LIPO = @LIPO@
 LIBTOOL = @LIBTOOL@ --tag=CC
 LIBWRAP = @LIBWRAP@
 LIPO = @LIPO@
@@ -223,7 +225,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@
@@ -253,6 +254,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@
@@ -268,6 +270,7 @@ rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
 rpcgen_CFLAGS = $(CFLAGS_FOR_BUILD)
 rpcgen_CPPLAGS = $(CPPFLAGS_FOR_BUILD)
 rpcgen_LDFLAGS = $(LDFLAGS_FOR_BUILD)
 rpcgen_CFLAGS = $(CFLAGS_FOR_BUILD)
 rpcgen_CPPLAGS = $(CPPFLAGS_FOR_BUILD)
 rpcgen_LDFLAGS = $(LDFLAGS_FOR_BUILD)
+rpcgen_LDADD = $(LIBTIRPC)
 MAINTAINERCLEANFILES = Makefile.in
 EXTRA_DIST = rpcgen.new.1
 all: all-am
 MAINTAINERCLEANFILES = Makefile.in
 EXTRA_DIST = rpcgen.new.1
 all: all-am
index 719b21eb9a94fbc517edbb5c4d925dd1401371d0..e25acbad9240485840c02e98cda4fe654d4b8ab6 100644 (file)
@@ -35,8 +35,10 @@ build_triplet = @build@
 host_triplet = @host@
 @CONFIG_NFSV4_TRUE@am__append_1 = idmapd
 @CONFIG_NFSIDMAP_TRUE@@CONFIG_NFSV4_TRUE@am__append_2 = nfsidmap
 host_triplet = @host@
 @CONFIG_NFSV4_TRUE@am__append_1 = idmapd
 @CONFIG_NFSIDMAP_TRUE@@CONFIG_NFSV4_TRUE@am__append_2 = nfsidmap
-@CONFIG_GSS_TRUE@am__append_3 = gssd
-@CONFIG_MOUNT_TRUE@am__append_4 = mount
+@CONFIG_NFSV41_TRUE@am__append_3 = blkmapd
+@CONFIG_GSS_TRUE@am__append_4 = gssd
+@CONFIG_MOUNT_TRUE@am__append_5 = mount
+@CONFIG_NFSDCLD_TRUE@am__append_6 = nfsdcld
 subdir = utils
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 subdir = utils
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -49,12 +51,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 \
@@ -81,8 +79,8 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
        distdir
 ETAGS = etags
 CTAGS = ctags
        distdir
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = exportfs mountd nfsd nfsstat showmount statd idmapd \
-       nfsidmap gssd mount
+DIST_SUBDIRS = exportfs mountd nfsd nfsstat showmount statd osd_login \
+       idmapd nfsidmap blkmapd gssd mount nfsdcld
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -169,12 +167,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@
@@ -239,7 +242,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@
@@ -269,6 +271,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@
@@ -277,7 +280,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 OPTDIRS = $(am__append_1) $(am__append_2) $(am__append_3) \
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 OPTDIRS = $(am__append_1) $(am__append_2) $(am__append_3) \
-       $(am__append_4)
+       $(am__append_4) $(am__append_5) $(am__append_6)
 SUBDIRS = \
        exportfs \
        mountd \
 SUBDIRS = \
        exportfs \
        mountd \
@@ -285,6 +288,7 @@ SUBDIRS = \
        nfsstat \
        showmount \
        statd \
        nfsstat \
        showmount \
        statd \
+       osd_login \
        $(OPTDIRS)
 
 MAINTAINERCLEANFILES = Makefile.in
        $(OPTDIRS)
 
 MAINTAINERCLEANFILES = Makefile.in
index ef666ffc2a541f469316ca2c19bed8e49a320d0a..e2048cd46f82dbdf930ed92990989f7735c81fec 100644 (file)
@@ -47,12 +47,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 \
@@ -176,12 +172,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@
@@ -246,7 +247,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@
@@ -276,6 +276,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@
index 0c516fa1b075cd852f109a1cfeb62956601ce4bf..47b73be09c8e114b35464ad4d595d6eb24b76a98 100644 (file)
@@ -196,7 +196,6 @@ classes of tracing to be enabled.  Consult the kernel header files to
 find out what number correspond to what tracing.
 
 .SH SEE ALSO
 find out what number correspond to what tracing.
 
 .SH SEE ALSO
-.BR nfsd (8),
 .BR rpc.nfsd (8),
 .BR exports (5),
 .BR nfsstat (8),
 .BR rpc.nfsd (8),
 .BR exports (5),
 .BR nfsstat (8),
index 244fa4ec39a14bb7d51e09f1f0d8ed82c70c3cfc..82c849513bf9b7d4f9f8d243a6acfd9dc9e5887d 100644 (file)
@@ -48,12 +48,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 \
@@ -78,8 +74,8 @@ gss_clnt_send_err_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        -o $@
 am__objects_1 = gssd-context.$(OBJEXT) gssd-context_mit.$(OBJEXT) \
        gssd-context_heimdal.$(OBJEXT) gssd-context_lucid.$(OBJEXT) \
        -o $@
 am__objects_1 = gssd-context.$(OBJEXT) gssd-context_mit.$(OBJEXT) \
        gssd-context_heimdal.$(OBJEXT) gssd-context_lucid.$(OBJEXT) \
-       gssd-context_spkm3.$(OBJEXT) gssd-gss_util.$(OBJEXT) \
-       gssd-gss_oids.$(OBJEXT) gssd-err_util.$(OBJEXT)
+       gssd-gss_util.$(OBJEXT) gssd-gss_oids.$(OBJEXT) \
+       gssd-err_util.$(OBJEXT)
 am_gssd_OBJECTS = $(am__objects_1) gssd-gssd.$(OBJEXT) \
        gssd-gssd_main_loop.$(OBJEXT) gssd-gssd_proc.$(OBJEXT) \
        gssd-krb5_util.$(OBJEXT)
 am_gssd_OBJECTS = $(am__objects_1) gssd-gssd.$(OBJEXT) \
        gssd-gssd_main_loop.$(OBJEXT) gssd-gssd_proc.$(OBJEXT) \
        gssd-krb5_util.$(OBJEXT)
@@ -93,8 +89,7 @@ gssd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 am__objects_2 = svcgssd-context.$(OBJEXT) \
        svcgssd-context_mit.$(OBJEXT) \
        svcgssd-context_heimdal.$(OBJEXT) \
 am__objects_2 = svcgssd-context.$(OBJEXT) \
        svcgssd-context_mit.$(OBJEXT) \
        svcgssd-context_heimdal.$(OBJEXT) \
-       svcgssd-context_lucid.$(OBJEXT) \
-       svcgssd-context_spkm3.$(OBJEXT) svcgssd-gss_util.$(OBJEXT) \
+       svcgssd-context_lucid.$(OBJEXT) svcgssd-gss_util.$(OBJEXT) \
        svcgssd-gss_oids.$(OBJEXT) svcgssd-err_util.$(OBJEXT)
 am_svcgssd_OBJECTS = $(am__objects_2) svcgssd-svcgssd.$(OBJEXT) \
        svcgssd-svcgssd_main_loop.$(OBJEXT) \
        svcgssd-gss_oids.$(OBJEXT) svcgssd-err_util.$(OBJEXT)
 am_svcgssd_OBJECTS = $(am__objects_2) svcgssd-svcgssd.$(OBJEXT) \
        svcgssd-svcgssd_main_loop.$(OBJEXT) \
@@ -102,6 +97,7 @@ am_svcgssd_OBJECTS = $(am__objects_2) svcgssd-svcgssd.$(OBJEXT) \
        svcgssd-svcgssd_proc.$(OBJEXT) svcgssd-svcgssd_krb5.$(OBJEXT)
 svcgssd_OBJECTS = $(am_svcgssd_OBJECTS)
 svcgssd_DEPENDENCIES = ../../support/nfs/libnfs.a \
        svcgssd-svcgssd_proc.$(OBJEXT) svcgssd-svcgssd_krb5.$(OBJEXT)
 svcgssd_OBJECTS = $(am_svcgssd_OBJECTS)
 svcgssd_DEPENDENCIES = ../../support/nfs/libnfs.a \
+       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1)
 svcgssd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1)
 svcgssd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -212,12 +208,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@
@@ -282,7 +283,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@
@@ -312,6 +312,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@
@@ -333,7 +334,6 @@ COMMON_SRCS = \
        context_mit.c \
        context_heimdal.c \
        context_lucid.c \
        context_mit.c \
        context_heimdal.c \
        context_lucid.c \
-       context_spkm3.c \
        gss_util.c \
        gss_oids.c \
        err_util.c \
        gss_util.c \
        gss_oids.c \
        err_util.c \
@@ -357,7 +357,7 @@ gssd_SOURCES = \
 gssd_LDADD = ../../support/nfs/libnfs.a \
                $(RPCSECGSS_LIBS) $(GSSGLUE_LIBS) $(KRBLIBS)
 
 gssd_LDADD = ../../support/nfs/libnfs.a \
                $(RPCSECGSS_LIBS) $(GSSGLUE_LIBS) $(KRBLIBS)
 
-gssd_LDFLAGS = $(KRBLDFLAGS)
+gssd_LDFLAGS = $(KRBLDFLAGS) $(LIBTIRPC)
 gssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
              $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS)
 
 gssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
              $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS)
 
@@ -374,8 +374,8 @@ svcgssd_SOURCES = \
 
 svcgssd_LDADD = \
        ../../support/nfs/libnfs.a \
 
 svcgssd_LDADD = \
        ../../support/nfs/libnfs.a \
-       $(RPCSECGSS_LIBS) $(GSSGLUE_LIBS) -lnfsidmap \
-       $(KRBLIBS)
+       $(RPCSECGSS_LIBS) $(GSSGLUE_LIBS) $(LIBNFSIDMAP) \
+       $(KRBLIBS) $(LIBTIRPC)
 
 svcgssd_LDFLAGS = $(KRBLDFLAGS)
 svcgssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
 
 svcgssd_LDFLAGS = $(KRBLDFLAGS)
 svcgssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
@@ -518,7 +518,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssd-context_heimdal.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssd-context_lucid.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssd-context_mit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssd-context_heimdal.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssd-context_lucid.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssd-context_mit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssd-context_spkm3.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssd-err_util.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssd-gss_oids.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssd-gss_util.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssd-err_util.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssd-gss_oids.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssd-gss_util.Po@am__quote@
@@ -530,7 +529,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svcgssd-context_heimdal.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svcgssd-context_lucid.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svcgssd-context_mit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svcgssd-context_heimdal.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svcgssd-context_lucid.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svcgssd-context_mit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svcgssd-context_spkm3.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svcgssd-err_util.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svcgssd-gss_oids.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svcgssd-gss_util.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svcgssd-err_util.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svcgssd-gss_oids.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svcgssd-gss_util.Po@am__quote@
@@ -631,20 +629,6 @@ gssd-context_lucid.obj: context_lucid.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gssd_CFLAGS) $(CFLAGS) -c -o gssd-context_lucid.obj `if test -f 'context_lucid.c'; then $(CYGPATH_W) 'context_lucid.c'; else $(CYGPATH_W) '$(srcdir)/context_lucid.c'; fi`
 
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gssd_CFLAGS) $(CFLAGS) -c -o gssd-context_lucid.obj `if test -f 'context_lucid.c'; then $(CYGPATH_W) 'context_lucid.c'; else $(CYGPATH_W) '$(srcdir)/context_lucid.c'; fi`
 
-gssd-context_spkm3.o: context_spkm3.c
-@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gssd_CFLAGS) $(CFLAGS) -MT gssd-context_spkm3.o -MD -MP -MF $(DEPDIR)/gssd-context_spkm3.Tpo -c -o gssd-context_spkm3.o `test -f 'context_spkm3.c' || echo '$(srcdir)/'`context_spkm3.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/gssd-context_spkm3.Tpo $(DEPDIR)/gssd-context_spkm3.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='context_spkm3.c' object='gssd-context_spkm3.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gssd_CFLAGS) $(CFLAGS) -c -o gssd-context_spkm3.o `test -f 'context_spkm3.c' || echo '$(srcdir)/'`context_spkm3.c
-
-gssd-context_spkm3.obj: context_spkm3.c
-@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gssd_CFLAGS) $(CFLAGS) -MT gssd-context_spkm3.obj -MD -MP -MF $(DEPDIR)/gssd-context_spkm3.Tpo -c -o gssd-context_spkm3.obj `if test -f 'context_spkm3.c'; then $(CYGPATH_W) 'context_spkm3.c'; else $(CYGPATH_W) '$(srcdir)/context_spkm3.c'; fi`
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/gssd-context_spkm3.Tpo $(DEPDIR)/gssd-context_spkm3.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='context_spkm3.c' object='gssd-context_spkm3.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gssd_CFLAGS) $(CFLAGS) -c -o gssd-context_spkm3.obj `if test -f 'context_spkm3.c'; then $(CYGPATH_W) 'context_spkm3.c'; else $(CYGPATH_W) '$(srcdir)/context_spkm3.c'; fi`
-
 gssd-gss_util.o: gss_util.c
 @am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gssd_CFLAGS) $(CFLAGS) -MT gssd-gss_util.o -MD -MP -MF $(DEPDIR)/gssd-gss_util.Tpo -c -o gssd-gss_util.o `test -f 'gss_util.c' || echo '$(srcdir)/'`gss_util.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/gssd-gss_util.Tpo $(DEPDIR)/gssd-gss_util.Po
 gssd-gss_util.o: gss_util.c
 @am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gssd_CFLAGS) $(CFLAGS) -MT gssd-gss_util.o -MD -MP -MF $(DEPDIR)/gssd-gss_util.Tpo -c -o gssd-gss_util.o `test -f 'gss_util.c' || echo '$(srcdir)/'`gss_util.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/gssd-gss_util.Tpo $(DEPDIR)/gssd-gss_util.Po
@@ -799,20 +783,6 @@ svcgssd-context_lucid.obj: context_lucid.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(svcgssd_CFLAGS) $(CFLAGS) -c -o svcgssd-context_lucid.obj `if test -f 'context_lucid.c'; then $(CYGPATH_W) 'context_lucid.c'; else $(CYGPATH_W) '$(srcdir)/context_lucid.c'; fi`
 
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(svcgssd_CFLAGS) $(CFLAGS) -c -o svcgssd-context_lucid.obj `if test -f 'context_lucid.c'; then $(CYGPATH_W) 'context_lucid.c'; else $(CYGPATH_W) '$(srcdir)/context_lucid.c'; fi`
 
-svcgssd-context_spkm3.o: context_spkm3.c
-@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(svcgssd_CFLAGS) $(CFLAGS) -MT svcgssd-context_spkm3.o -MD -MP -MF $(DEPDIR)/svcgssd-context_spkm3.Tpo -c -o svcgssd-context_spkm3.o `test -f 'context_spkm3.c' || echo '$(srcdir)/'`context_spkm3.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/svcgssd-context_spkm3.Tpo $(DEPDIR)/svcgssd-context_spkm3.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='context_spkm3.c' object='svcgssd-context_spkm3.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(svcgssd_CFLAGS) $(CFLAGS) -c -o svcgssd-context_spkm3.o `test -f 'context_spkm3.c' || echo '$(srcdir)/'`context_spkm3.c
-
-svcgssd-context_spkm3.obj: context_spkm3.c
-@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(svcgssd_CFLAGS) $(CFLAGS) -MT svcgssd-context_spkm3.obj -MD -MP -MF $(DEPDIR)/svcgssd-context_spkm3.Tpo -c -o svcgssd-context_spkm3.obj `if test -f 'context_spkm3.c'; then $(CYGPATH_W) 'context_spkm3.c'; else $(CYGPATH_W) '$(srcdir)/context_spkm3.c'; fi`
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/svcgssd-context_spkm3.Tpo $(DEPDIR)/svcgssd-context_spkm3.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='context_spkm3.c' object='svcgssd-context_spkm3.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(svcgssd_CFLAGS) $(CFLAGS) -c -o svcgssd-context_spkm3.obj `if test -f 'context_spkm3.c'; then $(CYGPATH_W) 'context_spkm3.c'; else $(CYGPATH_W) '$(srcdir)/context_spkm3.c'; fi`
-
 svcgssd-gss_util.o: gss_util.c
 @am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(svcgssd_CFLAGS) $(CFLAGS) -MT svcgssd-gss_util.o -MD -MP -MF $(DEPDIR)/svcgssd-gss_util.Tpo -c -o svcgssd-gss_util.o `test -f 'gss_util.c' || echo '$(srcdir)/'`gss_util.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/svcgssd-gss_util.Tpo $(DEPDIR)/svcgssd-gss_util.Po
 svcgssd-gss_util.o: gss_util.c
 @am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(svcgssd_CFLAGS) $(CFLAGS) -MT svcgssd-gss_util.o -MD -MP -MF $(DEPDIR)/svcgssd-gss_util.Tpo -c -o svcgssd-gss_util.o `test -f 'gss_util.c' || echo '$(srcdir)/'`gss_util.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/svcgssd-gss_util.Tpo $(DEPDIR)/svcgssd-gss_util.Po
index 5ff16f1c783d74265d2b11f149bcb661030ff683..0e327b04d87250f6a037670aee825fb8db6887d5 100644 (file)
@@ -126,7 +126,7 @@ display_status_1(char *m, u_int32_t code, int type, const gss_OID mech)
                                "gss_display_status called from %s\n", m);
                        break;
                } else {
                                "gss_display_status called from %s\n", m);
                        break;
                } else {
-                       printerr(2, "ERROR: GSS-API: (%s) error in %s(): %s\n",
+                       printerr(0, "ERROR: GSS-API: (%s) error in %s(): %s\n",
                            typestr, m, (char *)msg.value);
                }
 
                            typestr, m, (char *)msg.value);
                }
 
index a46b3bd01bf6b6bf107182bc5d70abf1c9cb4d93..aa394359e27398fd3dfe25462ca2be177b7088d4 100644 (file)
@@ -676,7 +676,7 @@ do_error_downcall(int k5_fd, uid_t uid, int err)
        unsigned int timeout = 0;
        int     zero = 0;
 
        unsigned int timeout = 0;
        int     zero = 0;
 
-       printerr(2, "doing error downcall\n");
+       printerr(1, "doing error downcall\n");
 
        if (WRITE_BYTES(&p, end, uid)) goto out_err;
        if (WRITE_BYTES(&p, end, timeout)) goto out_err;
 
        if (WRITE_BYTES(&p, end, uid)) goto out_err;
        if (WRITE_BYTES(&p, end, timeout)) goto out_err;
@@ -953,7 +953,7 @@ process_krb5_upcall(struct clnt_info *clp, uid_t uid, int fd, char *tgtname,
        int                     create_resp = -1;
        int                     err, downcall_err = -EACCES;
 
        int                     create_resp = -1;
        int                     err, downcall_err = -EACCES;
 
-       printerr(2, "handling krb5 upcall (%s)\n", clp->dirname);
+       printerr(1, "handling krb5 upcall (%s)\n", clp->dirname);
 
        if (tgtname) {
                if (clp->servicename) {
 
        if (tgtname) {
                if (clp->servicename) {
@@ -1071,7 +1071,7 @@ process_krb5_upcall(struct clnt_info *clp, uid_t uid, int fd, char *tgtname,
        }
 
        if (!authgss_get_private_data(auth, &pd)) {
        }
 
        if (!authgss_get_private_data(auth, &pd)) {
-               printerr(2, "WARNING: Failed to obtain authentication "
+               printerr(1, "WARNING: Failed to obtain authentication "
                            "data for user with uid %d for server %s\n",
                         uid, clp->servername);
                goto out_return_error;
                            "data for user with uid %d for server %s\n",
                         uid, clp->servername);
                goto out_return_error;
index b5178668c5e4faed268df54fb87108bbddce2cd9..2345439a32b8d1832a4a6b67819e412204ddc985 100644 (file)
@@ -47,12 +47,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 \
@@ -67,7 +63,9 @@ am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"
 PROGRAMS = $(sbin_PROGRAMS)
 am_idmapd_OBJECTS = idmapd.$(OBJEXT)
 idmapd_OBJECTS = $(am_idmapd_OBJECTS)
 PROGRAMS = $(sbin_PROGRAMS)
 am_idmapd_OBJECTS = idmapd.$(OBJEXT)
 idmapd_OBJECTS = $(am_idmapd_OBJECTS)
-idmapd_DEPENDENCIES = ../../support/nfs/libnfs.a
+am__DEPENDENCIES_1 =
+idmapd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+       ../../support/nfs/libnfs.a
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -170,12 +168,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@
@@ -240,7 +243,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@
@@ -270,6 +272,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@
@@ -290,7 +293,7 @@ idmapd_SOURCES = \
        nfs_idmap.h \
        queue.h
 
        nfs_idmap.h \
        queue.h
 
-idmapd_LDADD = -levent -lnfsidmap ../../support/nfs/libnfs.a
+idmapd_LDADD = $(LIBEVENT) $(LIBNFSIDMAP) ../../support/nfs/libnfs.a
 MAINTAINERCLEANFILES = Makefile.in
 all: all-am
 
 MAINTAINERCLEANFILES = Makefile.in
 all: all-am
 
index 86699a621cdcf369bc44017d9826d479f840bac4..07ef240e1fbf17bd349eed3081c94780623e1e3f 100644 (file)
@@ -53,12 +53,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 \
@@ -92,7 +88,8 @@ mount_nfs_OBJECTS = $(am_mount_nfs_OBJECTS)
 am__DEPENDENCIES_1 =
 @CONFIG_LIBMOUNT_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 mount_nfs_DEPENDENCIES = ../../support/nfs/libnfs.a \
 am__DEPENDENCIES_1 =
 @CONFIG_LIBMOUNT_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 mount_nfs_DEPENDENCIES = ../../support/nfs/libnfs.a \
-       ../../support/export/libexport.a $(am__DEPENDENCIES_2)
+       ../../support/export/libexport.a $(am__DEPENDENCIES_1) \
+       $(am__DEPENDENCIES_2)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -196,12 +193,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@
@@ -266,7 +268,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@
@@ -299,6 +300,7 @@ sbindir = /sbin
 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@
@@ -315,7 +317,7 @@ mount_common = error.c network.c token.c parse_opt.c parse_dev.c \
        nfs_mount4.h stropts.h version.h mount_config.h utils.c \
        utils.h $(am__append_1)
 mount_nfs_LDADD = ../../support/nfs/libnfs.a \
        nfs_mount4.h stropts.h version.h mount_config.h utils.c \
        utils.h $(am__append_1)
 mount_nfs_LDADD = ../../support/nfs/libnfs.a \
-       ../../support/export/libexport.a $(am__append_5)
+       ../../support/export/libexport.a $(LIBTIRPC) $(am__append_5)
 mount_nfs_SOURCES = $(mount_common) $(am__append_4) $(am__append_6)
 MAINTAINERCLEANFILES = Makefile.in
 all: all-am
 mount_nfs_SOURCES = $(mount_common) $(am__append_4) $(am__append_6)
 MAINTAINERCLEANFILES = Makefile.in
 all: all-am
index 7ebbf4b29e54f5e2fbd3aaece919b2dfeeb4c28d..eedbddab87c63e3ea99c2a8507d7028c0d6cc2b5 100644 (file)
@@ -57,7 +57,7 @@ mtab_does_not_exist(void) {
        return var_mtab_does_not_exist;
 }
 
        return var_mtab_does_not_exist;
 }
 
-int
+static int
 mtab_is_a_symlink(void) {
         get_mtab_info();
         return var_mtab_is_a_symlink;
 mtab_is_a_symlink(void) {
         get_mtab_info();
         return var_mtab_is_a_symlink;
index 8676c8c23dfd7d0738265d09d6e7f27ef9c13cca..313bf9b3bd9f00d4ae63deb722b341521bcdff89 100644 (file)
@@ -7,7 +7,6 @@
 #define _PATH_FSTAB "/etc/fstab"
 #endif
 
 #define _PATH_FSTAB "/etc/fstab"
 #endif
 
-int mtab_is_a_symlink(void);
 int mtab_is_writable(void);
 int mtab_does_not_exist(void);
 void reset_mtab_info(void);
 int mtab_is_writable(void);
 int mtab_does_not_exist(void);
 void reset_mtab_info(void);
index cc078eba336db7f47ad7bae1a5e9f6826ec0a973..eea00afe2679f28e3e4f10ea11c0553f5f51f712 100644 (file)
@@ -203,13 +203,6 @@ create_mtab (void) {
        int flags;
        mntFILE *mfp;
 
        int flags;
        mntFILE *mfp;
 
-       /* Avoid writing if the mtab is a symlink to /proc/mounts, since
-          that would create a file /proc/mounts in case the proc filesystem
-          is not mounted, and the fchmod below would also fail. */
-       if (mtab_is_a_symlink()) {
-               return EX_SUCCESS;
-       }
-
        lock_mtab();
 
        mfp = nfs_setmntent (MOUNTED, "a+");
        lock_mtab();
 
        mfp = nfs_setmntent (MOUNTED, "a+");
index 15a82d58b0cd1660226ff05072e55ceb7f5a8ec5..1a4561b948db5a331221d84525a7d0e48769ede4 100644 (file)
@@ -15,20 +15,16 @@ is meant to be used by the
 .BR mount (8)
 command for mounting NFS shares. This subcommand, however, can also be used as a standalone command with limited functionality.
 
 .BR mount (8)
 command for mounting NFS shares. This subcommand, however, can also be used as a standalone command with limited functionality.
 
+.BR mount.nfs4 
+is used for mounting NFSv4 file system, while 
+.BR mount.nfs 
+is used to mount NFS file systems versions 3 or 2.
 .I remotetarget 
 is a server share usually in the form of 
 .BR servername:/path/to/share.
 .I dir 
 is the directory on which the file system is to be mounted.
 
 .I remotetarget 
 is a server share usually in the form of 
 .BR servername:/path/to/share.
 .I dir 
 is the directory on which the file system is to be mounted.
 
-Under Linux 2.6.32 and later kernel versions,
-.BR mount.nfs
-can mount all NFS file system versions.  Under earlier Linux kernel versions,
-.BR mount.nfs4
-must be used for mounting NFSv4 file systems while
-.BR mount.nfs
-must be used for NFSv3 and v2.
-
 .SH OPTIONS
 .TP
 .BI "\-r"
 .SH OPTIONS
 .TP
 .BI "\-r"
index 835138735cc3fbf039a707f8df023ea0429883cf..902f33759b1a60e9b25048ccf07cbd60d6020929 100644 (file)
@@ -47,12 +47,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 \
@@ -75,6 +71,7 @@ am__DEPENDENCIES_1 =
 mountd_DEPENDENCIES = ../../support/export/libexport.a \
        ../../support/nfs/libnfs.a ../../support/misc/libmisc.a \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 mountd_DEPENDENCIES = ../../support/export/libexport.a \
        ../../support/nfs/libnfs.a ../../support/misc/libmisc.a \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -178,12 +175,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@
@@ -248,7 +250,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@
@@ -278,6 +279,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@
@@ -295,7 +297,7 @@ mountd_SOURCES = mountd.c mount_dispatch.c auth.c rmtab.c cache.c \
 mountd_LDADD = ../../support/export/libexport.a \
               ../../support/nfs/libnfs.a \
               ../../support/misc/libmisc.a \
 mountd_LDADD = ../../support/export/libexport.a \
               ../../support/nfs/libnfs.a \
               ../../support/misc/libmisc.a \
-              $(LIBBSD) $(LIBWRAP) $(LIBNSL) $(LIBBLKID)
+              $(LIBBSD) $(LIBWRAP) $(LIBNSL) $(LIBBLKID) $(LIBDL) $(LIBTIRPC)
 
 mountd_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) \
                  -I$(top_builddir)/support/include \
 
 mountd_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) \
                  -I$(top_builddir)/support/include \
index a228ed87fe595941d583f31b8f4f11cd7a997432..6db03c52c14433d35b4f3852429fd18580f67bc7 100644 (file)
@@ -47,12 +47,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 \
@@ -67,7 +63,8 @@ am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"
 PROGRAMS = $(sbin_PROGRAMS)
 am_nfsd_OBJECTS = nfsd.$(OBJEXT) nfssvc.$(OBJEXT)
 nfsd_OBJECTS = $(am_nfsd_OBJECTS)
 PROGRAMS = $(sbin_PROGRAMS)
 am_nfsd_OBJECTS = nfsd.$(OBJEXT) nfssvc.$(OBJEXT)
 nfsd_OBJECTS = $(am_nfsd_OBJECTS)
-nfsd_DEPENDENCIES = ../../support/nfs/libnfs.a
+am__DEPENDENCIES_1 =
+nfsd_DEPENDENCIES = ../../support/nfs/libnfs.a $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -170,12 +167,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@
@@ -240,7 +242,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@
@@ -270,6 +271,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@
@@ -282,7 +284,7 @@ EXTRA_DIST = $(man8_MANS)
 RPCPREFIX = rpc.
 KPREFIX = @kprefix@
 nfsd_SOURCES = nfsd.c nfssvc.c
 RPCPREFIX = rpc.
 KPREFIX = @kprefix@
 nfsd_SOURCES = nfsd.c nfssvc.c
-nfsd_LDADD = ../../support/nfs/libnfs.a
+nfsd_LDADD = ../../support/nfs/libnfs.a $(LIBTIRPC)
 MAINTAINERCLEANFILES = Makefile.in
 all: all-am
 
 MAINTAINERCLEANFILES = Makefile.in
 all: all-am
 
index 21c5080bf172c764f01826ef28617f230d927de4..1cf92969a6dd86506d96d03a58d9926de53e2fbd 100644 (file)
@@ -94,7 +94,6 @@ address family combinations that are marked visible in the
 database.
 
 .SH SEE ALSO
 database.
 
 .SH SEE ALSO
-.BR nfsd (7),
 .BR rpc.mountd (8),
 .BR exports (5),
 .BR exportfs (8),
 .BR rpc.mountd (8),
 .BR exports (5),
 .BR exportfs (8),
index 243aa6583d72dec10f0cdeff04a2917c4e35bd4f..a1948f3b50c6df8bde920e62aafddf88b414ff05 100644 (file)
@@ -47,12 +47,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 \
@@ -171,12 +167,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@
@@ -241,7 +242,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@
@@ -271,6 +271,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@
index da9d5b36ca98b53d0d358b9f15ddfaa5a09c676c..00b0d5a2afd49a5ccdf2a133fc3aee1cc937efeb 100644 (file)
@@ -47,12 +47,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 \
@@ -67,8 +63,10 @@ am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"
 PROGRAMS = $(sbin_PROGRAMS)
 am_showmount_OBJECTS = showmount-showmount.$(OBJEXT)
 showmount_OBJECTS = $(am_showmount_OBJECTS)
 PROGRAMS = $(sbin_PROGRAMS)
 am_showmount_OBJECTS = showmount-showmount.$(OBJEXT)
 showmount_OBJECTS = $(am_showmount_OBJECTS)
+am__DEPENDENCIES_1 =
 showmount_DEPENDENCIES = ../../support/export/libexport.a \
 showmount_DEPENDENCIES = ../../support/export/libexport.a \
-       ../../support/nfs/libnfs.a ../../support/misc/libmisc.a
+       ../../support/nfs/libnfs.a ../../support/misc/libmisc.a \
+       $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -171,12 +169,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@
@@ -241,7 +244,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@
@@ -271,6 +273,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@
@@ -283,7 +286,8 @@ EXTRA_DIST = $(man8_MANS)
 showmount_SOURCES = showmount.c
 showmount_LDADD = ../../support/export/libexport.a \
                  ../../support/nfs/libnfs.a \
 showmount_SOURCES = showmount.c
 showmount_LDADD = ../../support/export/libexport.a \
                  ../../support/nfs/libnfs.a \
-                 ../../support/misc/libmisc.a
+                 ../../support/misc/libmisc.a \
+                 $(LIBTIRPC)
 
 showmount_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) \
                   -I$(top_builddir)/support/export
 
 showmount_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) \
                   -I$(top_builddir)/support/export
index 05ff5c3c7afb3518855ea6149f4889cc60fee90d..b90e69b8a17f3559185807f4c3e9906019740826 100644 (file)
@@ -49,12 +49,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 \
@@ -73,7 +69,7 @@ sm_notify_OBJECTS = $(am_sm_notify_OBJECTS)
 am__DEPENDENCIES_1 =
 sm_notify_DEPENDENCIES = ../../support/nsm/libnsm.a \
        ../../support/nfs/libnfs.a $(am__DEPENDENCIES_1) \
 am__DEPENDENCIES_1 =
 sm_notify_DEPENDENCIES = ../../support/nsm/libnsm.a \
        ../../support/nfs/libnfs.a $(am__DEPENDENCIES_1) \
-       $(am__DEPENDENCIES_1)
+       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_statd_OBJECTS = callback.$(OBJEXT) notlist.$(OBJEXT) misc.$(OBJEXT) \
        monitor.$(OBJEXT) hostname.$(OBJEXT) simu.$(OBJEXT) \
        stat.$(OBJEXT) statd.$(OBJEXT) svc_run.$(OBJEXT) \
 am_statd_OBJECTS = callback.$(OBJEXT) notlist.$(OBJEXT) misc.$(OBJEXT) \
        monitor.$(OBJEXT) hostname.$(OBJEXT) simu.$(OBJEXT) \
        stat.$(OBJEXT) statd.$(OBJEXT) svc_run.$(OBJEXT) \
@@ -82,7 +78,7 @@ statd_OBJECTS = $(am_statd_OBJECTS)
 statd_DEPENDENCIES = ../../support/nsm/libnsm.a \
        ../../support/nfs/libnfs.a ../../support/misc/libmisc.a \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 statd_DEPENDENCIES = ../../support/nsm/libnsm.a \
        ../../support/nfs/libnfs.a ../../support/misc/libmisc.a \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-       $(am__DEPENDENCIES_1)
+       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -186,12 +182,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@
@@ -256,7 +257,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@
@@ -286,6 +286,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@
@@ -306,11 +307,11 @@ BUILT_SOURCES = $(GENFILES)
 statd_LDADD = ../../support/nsm/libnsm.a \
              ../../support/nfs/libnfs.a \
              ../../support/misc/libmisc.a \
 statd_LDADD = ../../support/nsm/libnsm.a \
              ../../support/nfs/libnfs.a \
              ../../support/misc/libmisc.a \
-             $(LIBWRAP) $(LIBNSL) $(LIBCAP)
+             $(LIBWRAP) $(LIBNSL) $(LIBCAP) $(LIBTIRPC)
 
 sm_notify_LDADD = ../../support/nsm/libnsm.a \
                  ../../support/nfs/libnfs.a \
 
 sm_notify_LDADD = ../../support/nsm/libnsm.a \
                  ../../support/nfs/libnfs.a \
-                 $(LIBNSL) $(LIBCAP)
+                 $(LIBNSL) $(LIBCAP) $(LIBTIRPC)
 
 EXTRA_DIST = sim_sm_inter.x $(man8_MANS) COPYRIGHT simulate.c
 @CONFIG_RPCGEN_FALSE@RPCGEN = @RPCGEN_PATH@
 
 EXTRA_DIST = sim_sm_inter.x $(man8_MANS) COPYRIGHT simulate.c
 @CONFIG_RPCGEN_FALSE@RPCGEN = @RPCGEN_PATH@
index d16549a1c6e222cfcd6f979c57acca4116ab6a2e..01fdb41301889bf6f36d6d68d5cc4d6b51673b33 100644 (file)
@@ -190,7 +190,7 @@ static void run_sm_notify(int outport)
        char *av[6];
        int ac = 0;
 
        char *av[6];
        int ac = 0;
 
-       av[ac++] = "/sbin/sm-notify";
+       av[ac++] = "/usr/sbin/sm-notify";
        if (run_mode & MODE_NODAEMON)
                av[ac++] = "-d";
        if (outport) {
        if (run_mode & MODE_NODAEMON)
                av[ac++] = "-d";
        if (outport) {