Imported upstream 1.2.6

[nfs-utils.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 920e8da0216c447c1c93a017f8dea6c17043d148..583c603f1b6c8123f3f0dc4abdee6e70a6c5e377 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl

-AC_INIT([linux nfs-utils],[1.2.5],[linux-nfs@vger.kernel.org],[nfs-utils])
+AC_INIT([linux nfs-utils],[1.2.6],[linux-nfs@vger.kernel.org],[nfs-utils])

 AC_CANONICAL_BUILD([])
 AC_CANONICAL_HOST([])
 AC_CONFIG_MACRO_DIR(aclocal)
 AC_CANONICAL_BUILD([])
 AC_CANONICAL_HOST([])
 AC_CONFIG_MACRO_DIR(aclocal)


@@ -185,6 +185,12 @@ else
        AM_CONDITIONAL(MOUNT_CONFIG, [test "$enable_mount" = "yes"])
 fi
 
        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
 
 dnl Check for TI-RPC library and headers
 AC_LIBTIRPC
 


@@ -260,12 +266,29 @@ if test "$enable_nfsv4" = yes; then
   dnl check for the keyutils libraries and headers
   AC_KEYUTILS
 
   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
     AC_RPCSEC_VERSION
   fi
 fi
   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
     AC_RPCSEC_VERSION
   fi
 fi

+dnl enable nfsidmap when its support by libnfsidmap
+AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
+

 
 if test "$enable_nfsv41" = yes; then
   AC_CHECK_LIB([devmapper], [dm_task_create], [LIBDEVMAPPER="-ldevmapper"], AC_MSG_ERROR([libdevmapper needed]))
 
 if test "$enable_nfsv41" = yes; then
   AC_CHECK_LIB([devmapper], [dm_task_create], [LIBDEVMAPPER="-ldevmapper"], AC_MSG_ERROR([libdevmapper needed]))


@@ -316,9 +339,6 @@ if test "$enable_gss" = yes; then
   dnl 'gss' also depends on nfsidmap.h - at least for svcgssd_proc.c
   AC_LIBNFSIDMAP
 
   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
 
   dnl Check for Kerberos V5
   AC_KERBEROS_V5
 


@@ -460,6 +480,7 @@ AC_CONFIG_FILES([
        tools/nfs-iostat/Makefile
        utils/Makefile
        utils/blkmapd/Makefile
        tools/nfs-iostat/Makefile
        utils/Makefile
        utils/blkmapd/Makefile

+       utils/nfsdcld/Makefile

        utils/exportfs/Makefile
        utils/gssd/Makefile
        utils/idmapd/Makefile
        utils/exportfs/Makefile
        utils/gssd/Makefile
        utils/idmapd/Makefile


@@ -470,6 +491,7 @@ AC_CONFIG_FILES([
        utils/nfsidmap/Makefile
        utils/showmount/Makefile
        utils/statd/Makefile
        utils/nfsidmap/Makefile
        utils/showmount/Makefile
        utils/statd/Makefile

+       utils/osd_login/Makefile

        tests/Makefile
        tests/nsm_client/Makefile])
 AC_OUTPUT
        tests/Makefile
        tests/nsm_client/Makefile])
 AC_OUTPUT