nfsidmap: Added Error Logging

[nfs-utils.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7f4b88cfb1eab6e991c33c98e4f525fe67b8e867..f101b861266d4fc434981ad36a81dd1edf195b2e 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.4],[linux-nfs@vger.kernel.org],[nfs-utils])
+AC_INIT([linux nfs-utils],[1.2.5],[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)


@@ -61,7 +61,6 @@ AC_ARG_ENABLE(nfsv4,
        enable_nfsv4=$enableval,
        enable_nfsv4=yes)
        if test "$enable_nfsv4" = yes; then
        enable_nfsv4=$enableval,
        enable_nfsv4=yes)
        if test "$enable_nfsv4" = yes; then

-               AC_DEFINE(NFS4_SUPPORTED, 1, [Define this if you want NFSv4 support compiled in])

                IDMAPD=idmapd
        else
                enable_nfsv4=
                IDMAPD=idmapd
        else
                enable_nfsv4=


@@ -77,8 +76,10 @@ AC_ARG_ENABLE(nfsv41,
        enable_nfsv41=$enableval,
        enable_nfsv41=yes)
        if test "$enable_nfsv41" = yes; then
        enable_nfsv41=$enableval,
        enable_nfsv41=yes)
        if test "$enable_nfsv41" = yes; then

+               if test "$enable_nfsv4" != yes; then
+                       AC_MSG_ERROR([NFS v4.1 is enabled but NFS v4 is not. Use --disable-nfsv41])
+               fi

                BLKMAPD=blkmapd
                BLKMAPD=blkmapd

-               AC_DEFINE(NFS41_SUPPORTED, 1, [Define this if you want NFSv41 support compiled in])

        else
                enable_nfsv41=
                BLKMAPD=
        else
                enable_nfsv41=
                BLKMAPD=


@@ -92,7 +93,6 @@ AC_ARG_ENABLE(gss,
        enable_gss=$enableval,
        enable_gss=yes)
        if test "$enable_gss" = yes; then
        enable_gss=$enableval,
        enable_gss=yes)
        if test "$enable_gss" = yes; then

-               AC_DEFINE(GSS_SUPPORTED, 1, [Define this if you want rpcsec_gss support compiled in])

                GSSD=gssd
                SVCGSSD=svcgssd
        else
                GSSD=gssd
                SVCGSSD=svcgssd
        else


@@ -265,6 +265,12 @@ if test "$enable_nfsv4" = yes; then
     AC_RPCSEC_VERSION
   fi
 fi
     AC_RPCSEC_VERSION
   fi
 fi

+
+if test "$enable_nfsv41" = yes; then
+  AC_CHECK_LIB([devmapper], [dm_task_create], [LIBDEVMAPPER="-ldevmapper"], AC_MSG_ERROR([libdevmapper needed]))
+  AC_CHECK_HEADER(libdevmapper.h, , AC_MSG_ERROR([Cannot find devmapper header file libdevmapper.h]))
+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"])
 
 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"])