summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2012-11-08 14:36:56 -0500
committerSteve Dickson <steved@redhat.com>2012-11-11 18:01:23 -0500
commit37ebcfc42478bbbf5784504072b682037352a90e (patch)
tree40e7b119518a2dd04e5960763679690de02d8546
parentb20a49b5e7ca0d42f752d36a9dc0f2197243d6f0 (diff)
downloadnfs-utils-37ebcfc42478bbbf5784504072b682037352a90e.zip
nfs-utils-37ebcfc42478bbbf5784504072b682037352a90e.tar.gz
nfs-utils-37ebcfc42478bbbf5784504072b682037352a90e.tar.xz
nfsdcltrack: rename the nfsdcld directory and options to nfsdcltrack
We'll soon be adding a new nfsdcltrack program, at which point it won't make much sense to call this directory and the config option "nfsdcld". Rename it to be a bit more generic. While we're at it, change the default for --enable-cltrack to "yes". When we introduce the one-shot program, we're going to want to build it by default anyway. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve Dickson <steved@redhat.com>
-rw-r--r--configure.ac20
-rw-r--r--utils/Makefile.am4
-rw-r--r--utils/nfsdcltrack/Makefile.am (renamed from utils/nfsdcld/Makefile.am)0
-rwxr-xr-xutils/nfsdcltrack/nfsdcldbin0 -> 64142 bytes
-rw-r--r--utils/nfsdcltrack/nfsdcld.c (renamed from utils/nfsdcld/nfsdcld.c)0
-rw-r--r--utils/nfsdcltrack/nfsdcld.man (renamed from utils/nfsdcld/nfsdcld.man)0
-rw-r--r--utils/nfsdcltrack/sqlite.c (renamed from utils/nfsdcld/sqlite.c)0
-rw-r--r--utils/nfsdcltrack/sqlite.h (renamed from utils/nfsdcld/sqlite.h)0
8 files changed, 12 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac
index a174bf4..825682c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,11 +185,11 @@ else
AM_CONDITIONAL(MOUNT_CONFIG, [test "$enable_mount" = "yes"])
fi
-AC_ARG_ENABLE(nfsdcld,
- [AC_HELP_STRING([--enable-nfsdcld],
- [Create nfsdcld NFSv4 clientid tracking daemon. @<:@default=no@:>@])],
- enable_nfsdcld=$enableval,
- enable_nfsdcld="no")
+AC_ARG_ENABLE(nfsdcltrack,
+ [AC_HELP_STRING([--enable-nfsdcltrack],
+ [enable NFSv4 clientid tracking programs @<:@default=yes@:>@])],
+ enable_nfsdctrack=$enableval,
+ enable_nfsdcltrack="yes")
dnl Check for TI-RPC library and headers
AC_LIBTIRPC
@@ -269,12 +269,12 @@ if test "$enable_nfsv4" = yes; then
dnl Check for sqlite3
AC_SQLITE3_VERS
- if test "$enable_nfsdcld" = "yes"; then
+ if test "$enable_nfsdcltrack" = "yes"; then
AC_CHECK_HEADERS([libgen.h sys/inotify.h], ,
- AC_MSG_ERROR([Cannot find header needed for nfsdcld]))
+ AC_MSG_ERROR([Cannot find header needed for nfsdcltrack]))
if test "$libsqlite3_cv_is_recent" != "yes" ; then
- AC_MSG_ERROR([nfsdcld requires sqlite3])
+ AC_MSG_ERROR([nfsdcltrack requires sqlite-devel])
fi
fi
@@ -292,7 +292,7 @@ if test "$enable_nfsv41" = yes; then
fi
dnl enable nfsidmap when its support by libnfsidmap
-AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
+AM_CONDITIONAL(CONFIG_NFSDCLTRACK, [test "$enable_nfsdcltrack" = "yes" ])
AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
@@ -477,7 +477,7 @@ AC_CONFIG_FILES([
tools/nfs-iostat/Makefile
utils/Makefile
utils/blkmapd/Makefile
- utils/nfsdcld/Makefile
+ utils/nfsdcltrack/Makefile
utils/exportfs/Makefile
utils/gssd/Makefile
utils/idmapd/Makefile
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 09045dd..b892dc8 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -21,8 +21,8 @@ if CONFIG_MOUNT
OPTDIRS += mount
endif
-if CONFIG_NFSDCLD
-OPTDIRS += nfsdcld
+if CONFIG_NFSDCLTRACK
+OPTDIRS += nfsdcltrack
endif
SUBDIRS = \
diff --git a/utils/nfsdcld/Makefile.am b/utils/nfsdcltrack/Makefile.am
index 073a71b..073a71b 100644
--- a/utils/nfsdcld/Makefile.am
+++ b/utils/nfsdcltrack/Makefile.am
diff --git a/utils/nfsdcltrack/nfsdcld b/utils/nfsdcltrack/nfsdcld
new file mode 100755
index 0000000..47801fc
--- /dev/null
+++ b/utils/nfsdcltrack/nfsdcld
Binary files differ
diff --git a/utils/nfsdcld/nfsdcld.c b/utils/nfsdcltrack/nfsdcld.c
index 473d069..473d069 100644
--- a/utils/nfsdcld/nfsdcld.c
+++ b/utils/nfsdcltrack/nfsdcld.c
diff --git a/utils/nfsdcld/nfsdcld.man b/utils/nfsdcltrack/nfsdcld.man
index 9ddaf64..9ddaf64 100644
--- a/utils/nfsdcld/nfsdcld.man
+++ b/utils/nfsdcltrack/nfsdcld.man
diff --git a/utils/nfsdcld/sqlite.c b/utils/nfsdcltrack/sqlite.c
index fc882c6..fc882c6 100644
--- a/utils/nfsdcld/sqlite.c
+++ b/utils/nfsdcltrack/sqlite.c
diff --git a/utils/nfsdcld/sqlite.h b/utils/nfsdcltrack/sqlite.h
index c85e7d6..c85e7d6 100644
--- a/utils/nfsdcld/sqlite.h
+++ b/utils/nfsdcltrack/sqlite.h