v4_root_add_parents: remove a possible buffer overflow.

[nfs-utils.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f101b861266d4fc434981ad36a81dd1edf195b2e..20c452b18a649933bb2e87404c1ca8aacbb3e086 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,9 +24,8 @@ AC_ARG_WITH(statedir,
        statedir=/var/lib/nfs)
        AC_SUBST(statedir)
 AC_ARG_WITH(statdpath,
-       [AC_HELP_STRING([--with-statdpath=/foo @<:@default=/var/lib/nfs@:>@],
-               [define statd's state dir as /foo instead of the NFS statedir]
-       )],
+       [AC_HELP_STRING([--with-statdpath=/foo],
+                       [define the statd state dir as /foo instead of the NFS statedir @<:@default=/var/lib/nfs@:>@])],
        statdpath=$withval,
        statdpath=$statedir
        )
@@ -186,6 +185,12 @@ 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")
+
 dnl Check for TI-RPC library and headers
 AC_LIBTIRPC
 
@@ -249,6 +254,8 @@ AC_CHECK_FUNC([getservbyname], ,
 
 AC_CHECK_LIB([crypt], [crypt], [LIBCRYPT="-lcrypt"])
 
+AC_CHECK_LIB([dl], [dlclose], [LIBDL="-ldl"])
+
 if test "$enable_nfsv4" = yes; then
   dnl check for libevent libraries and headers
   AC_LIBEVENT
@@ -259,6 +266,20 @@ if test "$enable_nfsv4" = yes; then
   dnl check for the keyutils libraries and headers
   AC_KEYUTILS
 
+  dnl Check for sqlite3
+  AC_SQLITE3_VERS
+
+  if test "$enable_nfsdcld" = "yes"; then
+       AC_CHECK_HEADERS([libgen.h sys/inotify.h], ,
+               AC_MSG_ERROR([Cannot find header needed for nfsdcld]))
+
+       if test "$libsqlite3_cv_is_recent" != "yes" ; then
+               AC_MSG_ERROR([nfsdcld requires sqlite3])
+       fi
+  fi
+
+  AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
+
   dnl librpcsecgss already has a dependency on libgssapi,
   dnl but we need to make sure we get the right version
   if test "$enable_gss" = yes; then
@@ -299,6 +320,7 @@ AC_SUBST(LIBSOCKET)
 AC_SUBST(LIBCRYPT)
 AC_SUBST(LIBBSD)
 AC_SUBST(LIBBLKID)
+AC_SUBST(LIBDL)
 
 if test "$enable_libmount" != no; then
    AC_CHECK_LIB(mount, mnt_context_do_mount, [LIBMOUNT="-lmount"], AC_MSG_ERROR([libmount needed]))
@@ -314,9 +336,6 @@ if test "$enable_gss" = yes; then
   dnl 'gss' also depends on nfsidmap.h - at least for svcgssd_proc.c
   AC_LIBNFSIDMAP
 
-  AC_CHECK_HEADERS([spkm3.h], ,
-                   [AC_MSG_WARN([Could not locate SPKM3 header; will not have SPKM3 support])])
-
   dnl Check for Kerberos V5
   AC_KERBEROS_V5
 
@@ -336,7 +355,7 @@ AC_CHECK_HEADERS([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 \
-                 ifaddrs.h])
+                 ifaddrs.h nfs-plugin.h])
 
 dnl *************************************************************
 dnl Checks for typedefs, structures, and compiler characteristics
@@ -458,6 +477,7 @@ AC_CONFIG_FILES([
        tools/nfs-iostat/Makefile
        utils/Makefile
        utils/blkmapd/Makefile
+       utils/nfsdcld/Makefile
        utils/exportfs/Makefile
        utils/gssd/Makefile
        utils/idmapd/Makefile
@@ -468,6 +488,7 @@ AC_CONFIG_FILES([
        utils/nfsidmap/Makefile
        utils/showmount/Makefile
        utils/statd/Makefile
+       utils/osd_login/Makefile
        tests/Makefile
        tests/nsm_client/Makefile])
 AC_OUTPUT