Whamcloud - gitweb
LU-3953 build: configure output improvments
[fs/lustre-release.git] / lustre / autoconf / lustre-core.m4
index dbe3f2a..e8802dc 100644 (file)
@@ -82,6 +82,15 @@ AC_TRY_COMPILE([
 ])
 ])
 
+AC_DEFUN([LC_GLIBC_SUPPORT_FHANDLES],
+[AC_CHECK_FUNCS([name_to_handle_at],[
+       AC_DEFINE(HAVE_FHANDLE_GLIBC_SUPPORT, 1,
+               [file handle and related syscalls are supported])
+],[
+       AC_MSG_WARN([file handle and related syscalls are not supported])
+])
+])
+
 #
 # LC_FUNC_DEV_SET_RDONLY
 #
@@ -257,7 +266,10 @@ dnl the AES symbol usually tied with arch, e.g. CRYPTO_AES_586
 dnl FIXME
 AC_DEFUN([LC_CONFIG_RMTCLIENT],
 [LB_LINUX_CONFIG_IM([CRYPTO_AES],[],[
-        AC_MSG_WARN([Lustre remote client require that CONFIG_CRYPTO_AES is enabled in your kernel.])
+        AC_MSG_WARN([
+
+Lustre remote client require that CONFIG_CRYPTO_AES is enabled in your kernel.
+])
 ])
 ])
 
@@ -275,20 +287,32 @@ AC_DEFUN([LC_CONFIG_GSS_KEYRING],
  if test x$enable_gss_keyring != xno; then
        LB_LINUX_CONFIG_IM([KEYS],[],
                           [gss_keyring_conf_test='fail';
-                           AC_MSG_WARN([GSS keyring backend require that CONFIG_KEYS be enabled in your kernel.])])
+                           AC_MSG_WARN([
+
+GSS keyring backend require that CONFIG_KEYS be enabled in your kernel.
+])])
 
        AC_CHECK_LIB([keyutils], [keyctl_search], [],
                     [gss_keyring_conf_test='fail';
-                     AC_MSG_WARN([libkeyutils is not found, which is required by gss keyring backend])],)
+                     AC_MSG_WARN([
+
+libkeyutils is not found, which is required by gss keyring backend
+])],)
 
        if test x$gss_keyring_conf_test != xfail; then
                AC_DEFINE([HAVE_GSS_KEYRING], [1], [Define this if you enable gss keyring backend])
                enable_gss_keyring='yes'
        else
                if test x$enable_gss_keyring == xyes; then
-                       AC_MSG_ERROR([Cannot enable gss_keyring. See above for details.])
+                       AC_MSG_ERROR([
+
+Cannot enable gss_keyring. See above for details.
+])
                else
-                       AC_MSG_WARN([Cannot enable gss keyring.  See above for details.])
+                       AC_MSG_WARN([
+
+Cannot enable gss keyring.  See above for details.
+])
                fi
        fi
  fi
@@ -297,7 +321,10 @@ AC_DEFUN([LC_CONFIG_GSS_KEYRING],
 AC_DEFUN([LC_CONFIG_SUNRPC],
 [LB_LINUX_CONFIG_IM([SUNRPC],[],
                     [if test x$sunrpc_required == xyes; then
-                         AC_MSG_ERROR([kernel SUNRPC support is required by using GSS.])
+                         AC_MSG_ERROR([
+
+kernel SUNRPC support is required by using GSS.
+])
                      fi])
 ])
 
@@ -341,9 +368,15 @@ AC_DEFUN([LC_CONFIG_GSS],
                                           [GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssglue";
                                            gss_conf_test='success'],
                                           [if test x$enable_gss == xyes; then
-                                               AC_MSG_ERROR([libgssapi or libgssglue is not found, which is required by GSS.])
+                                               AC_MSG_ERROR([
+
+libgssapi or libgssglue is not found, which is required by GSS.
+])
                                            else
-                                               AC_MSG_WARN([libgssapi or libgssglue is not found, which is required by GSS.])
+                                               AC_MSG_WARN([
+
+libgssapi or libgssglue is not found, which is required by GSS.
+])
                                            fi])],)
                AC_SUBST(GSSAPI_LIBS)
        fi
@@ -356,46 +389,6 @@ AC_DEFUN([LC_CONFIG_GSS],
  fi
 ])
 
-# 2.6.24
-
-# 2.6.24 has bio_endio with 2 args
-AC_DEFUN([LC_BIO_ENDIO_2ARG],
-[AC_MSG_CHECKING([if kernel has bio_endio with 2 args])
-LB_LINUX_TRY_COMPILE([
-        #include <linux/bio.h>
-],[
-        bio_endio(NULL, 0);
-], [
-        AC_MSG_RESULT([yes])
-        AC_DEFINE(HAVE_BIO_ENDIO_2ARG, 1,
-                [kernel has bio_endio with 2 args])
-],[
-        AC_MSG_RESULT([no])
-])
-])
-
-# 2.6.24 removes long aged procfs entry -> deleted member
-AC_DEFUN([LC_PROCFS_DELETED],
-[AC_MSG_CHECKING([if kernel has deleted member in procfs entry struct])
-LB_LINUX_TRY_COMPILE([
-       #include <linux/proc_fs.h>
-],[
-        struct proc_dir_entry pde;
-
-        pde.deleted = sizeof(pde);
-], [
-        AC_MSG_RESULT([yes])
-        AC_DEFINE(HAVE_PROCFS_DELETED, 1,
-                [kernel has deleted member in procfs entry struct])
-],[
-        AC_MSG_RESULT([no])
-])
-])
-
-#
-# 2.6.27
-#
-
 # up to v2.6.27 had a 3 arg version (inode, mask, nameidata)
 # v2.6.27->v2.6.37 had a 2 arg version (inode, mask)
 # v2.6.37->v3.0 had a 3 arg version (inode, mask, nameidata)
@@ -418,6 +411,22 @@ LB_LINUX_TRY_COMPILE([
 ])
 ])
 
+# 2.6.32 replaces 2 functions blk_queue_max_phys_segments and blk_queue_max_hw_segments by blk_queue_max_segments
+AC_DEFUN([LC_BLK_QUEUE_MAX_SEGMENTS],
+[AC_MSG_CHECKING([if blk_queue_max_segments is defined])
+LB_LINUX_TRY_COMPILE([
+       #include <linux/blkdev.h>
+],[
+       blk_queue_max_segments(NULL, 0);
+],[
+       AC_MSG_RESULT(yes)
+       AC_DEFINE(HAVE_BLK_QUEUE_MAX_SEGMENTS, 1,
+                 [blk_queue_max_segments is defined])
+],[
+       AC_MSG_RESULT(no)
+])
+])
+
 # 2.6.34 has quotactl_ops->[sg]et_dqblk that take struct fs_disk_quota
 AC_DEFUN([LC_HAVE_DQUOT_FS_DISK_QUOTA],
 tmp_flags="$EXTRA_KCFLAGS"
@@ -427,14 +436,25 @@ LB_LINUX_TRY_COMPILE([
        #include <linux/fs.h>
        #include <linux/quota.h>
 ],[
-       struct quotactl_ops qops = {};
-       struct fs_disk_quota fdq;
-       qops.set_dqblk(NULL, 0, 0, &fdq);
+       ((struct quotactl_ops *)0)->set_dqblk(NULL, 0, 0, (struct fs_disk_quota*)0);
 ],[
        AC_DEFINE(HAVE_DQUOT_FS_DISK_QUOTA, 1, [quotactl_ops.set_dqblk takes struct fs_disk_quota])
        AC_MSG_RESULT([yes])
 ],[
        AC_MSG_RESULT([no])
+       AC_MSG_CHECKING([if quotactl_ops.set_dqblk takes struct kqid & fs_disk_quota])
+       LB_LINUX_TRY_COMPILE([
+               #include <linux/fs.h>
+               #include <linux/quota.h>
+       ],[
+               ((struct quotactl_ops *)0)->set_dqblk((struct super_block*)0, *((struct kqid*)0), (struct fs_disk_quota*)0);
+       ],[
+               AC_DEFINE(HAVE_DQUOT_FS_DISK_QUOTA, 1, [quotactl_ops.set_dqblk takes struct fs_disk_quota])
+               AC_DEFINE(HAVE_DQUOT_KQID, 1, [quotactl_ops.set_dqblk takes struct kqid])
+               AC_MSG_RESULT([yes])
+       ],[
+               AC_MSG_RESULT([no])
+       ])
 ])
 EXTRA_KCFLAGS="$tmp_flags"
 ])
@@ -455,44 +475,6 @@ LB_LINUX_TRY_COMPILE([
 ])
 
 #
-# 2.6.27 sles11 move the quotaio_v1{2}.h from include/linux to fs
-# 2.6.32 move the quotaio_v1{2}.h from fs to fs/quota
-AC_DEFUN([LC_HAVE_QUOTAIO_H],
-[LB_CHECK_FILE([$LINUX/include/linux/quotaio_v2.h],[
-        AC_DEFINE(HAVE_QUOTAIO_H, 1,
-                [kernel has include/linux/quotaio_v2.h])
-],[LB_CHECK_FILE([$LINUX/fs/quotaio_v2.h],[
-               AC_DEFINE(HAVE_FS_QUOTAIO_H, 1,
-                [kernel has fs/quotaio_v1.h])
-],[LB_CHECK_FILE([$LINUX/fs/quota/quotaio_v2.h],[
-               AC_DEFINE(HAVE_FS_QUOTA_QUOTAIO_H, 1,
-                [kernel has fs/quota/quotaio_v2.h])
-],[
-        AC_MSG_RESULT([no])
-])
-])
-])
-])
-
-# 2.6.32
-
-# 2.6.32 replaces 2 functions blk_queue_max_phys_segments and blk_queue_max_hw_segments by blk_queue_max_segments
-AC_DEFUN([LC_BLK_QUEUE_MAX_SEGMENTS],
-[AC_MSG_CHECKING([if blk_queue_max_segments is defined])
-LB_LINUX_TRY_COMPILE([
-        #include <linux/blkdev.h>
-],[
-        blk_queue_max_segments(NULL, 0);
-],[
-        AC_MSG_RESULT(yes)
-        AC_DEFINE(HAVE_BLK_QUEUE_MAX_SEGMENTS, 1,
-                  [blk_queue_max_segments is defined])
-],[
-        AC_MSG_RESULT(no)
-])
-])
-
-#
 # LC_QUOTA64
 #
 # Check if kernel has been patched for 64-bit quota limits support.
@@ -716,6 +698,24 @@ AC_DEFINE(HAVE_SIMPLE_SETATTR, 1,
 ])
 
 #
+# truncate callback removed since 2.6.39
+#
+AC_DEFUN([LC_IOP_TRUNCATE],
+[AC_MSG_CHECKING([inode_operations has .truncate member function])
+LB_LINUX_TRY_COMPILE([
+        #include <linux/fs.h>
+],[
+        ((struct inode_operations *)0)->truncate(NULL);
+],[
+        AC_DEFINE(HAVE_INODEOPS_TRUNCATE, 1,
+                  [inode_operations has .truncate member function])
+        AC_MSG_RESULT([yes])
+],[
+        AC_MSG_RESULT([no])
+])
+])
+
+#
 # 2.6.39 remove unplug_fn from request_queue.
 #
 AC_DEFUN([LC_REQUEST_QUEUE_UNPLUG_FN],
@@ -753,6 +753,18 @@ LB_LINUX_TRY_COMPILE([
 ])
 
 #
+# 2.6.39 The open_by_handle_at() and name_to_handle_at() system calls were
+# added to Linux kernel 2.6.39.
+# Check if client supports these functions
+#
+AC_DEFUN([LC_HAVE_FHANDLE_SYSCALLS],
+[LB_LINUX_CONFIG_IM([FHANDLE],[
+       AC_DEFINE(HAVE_FHANDLE_SYSCALLS, 1,
+               [kernel supports fhandles and related syscalls])
+],[])
+])
+
+#
 # 3.0 dirty_inode() has a flag parameter
 # see kernel commit aa38572954ade525817fe88c54faebf85e5a61c0
 #
@@ -1029,18 +1041,18 @@ LB_LINUX_TRY_COMPILE([
 ])
 
 #
-# 3.4 switchs touch_atime to struct path
-# see kernel commit 68ac1234fb949b66941d94dce4157742799fc581
+# 3.4 converts d_alloc_root to d_make_root
+# see kernel commit 32991ab305ace7017c62f8eecbe5eb36dc32e13b
 #
-AC_DEFUN([LC_TOUCH_ATIME_1ARG],
-[AC_MSG_CHECKING([if touch_atime use one argument])
+AC_DEFUN([LC_HAVE_D_MAKE_ROOT],
+[AC_MSG_CHECKING([if have d_make_root])
 LB_LINUX_TRY_COMPILE([
        #include <linux/fs.h>
 ],[
-       touch_atime((struct path *)NULL);
+       d_make_root((struct inode *)NULL);
 ],[
-       AC_DEFINE(HAVE_TOUCH_ATIME_1ARG, 1,
-                 [touch_atime use one argument])
+       AC_DEFINE(HAVE_D_MAKE_ROOT, 1,
+                 [have d_make_root])
        AC_MSG_RESULT([yes])
 ],[
        AC_MSG_RESULT([no])
@@ -1048,18 +1060,22 @@ LB_LINUX_TRY_COMPILE([
 ])
 
 #
-# 3.4 converts d_alloc_root to d_make_root
-# see kernel commit 32991ab305ace7017c62f8eecbe5eb36dc32e13b
+# 3.4 cache_register/cache_unregister are removed
+# see kernel commit 2c5f846747526e2b83c5f1b8e69016be0e2e87c0
+# Note, since 2.6.37 cache_register_net/cache_unregister_net
+# are defined, but not exported.
+# 3.3 cache_register_net/cache_unregister_net are
+# exported and replacing cache_register/cache_unregister in 3.4
 #
-AC_DEFUN([LC_HAVE_D_MAKE_ROOT],
-[AC_MSG_CHECKING([if have d_make_root])
+AC_DEFUN([LC_HAVE_CACHE_REGISTER],
+[AC_MSG_CHECKING([if have cache_register])
 LB_LINUX_TRY_COMPILE([
-       #include <linux/fs.h>
+       #include <linux/sunrpc/cache.h>
 ],[
-       d_make_root((struct inode *)NULL);
+       cache_register(NULL);
 ],[
-       AC_DEFINE(HAVE_D_MAKE_ROOT, 1,
-                 [have d_make_root])
+       AC_DEFINE(HAVE_CACHE_REGISTER, 1,
+                 [have cache_register])
        AC_MSG_RESULT([yes])
 ],[
        AC_MSG_RESULT([no])
@@ -1220,7 +1236,7 @@ LB_LINUX_TRY_COMPILE([
 ])
 
 #
-# 3.8 struct file has new memeber f_inode
+# 3.8 struct file has new member f_inode
 #
 AC_DEFUN([LC_HAVE_FILE_F_INODE],
 [AC_MSG_CHECKING([if struct file has memeber f_inode])
@@ -1237,6 +1253,21 @@ LB_LINUX_TRY_COMPILE([
 ])
 ])
 
+AC_DEFUN([LC_HAVE_SUNRPC_UPCALL_HAS_3ARGS],
+[AC_MSG_CHECKING([if sunrpc_cache_pipe_upcall takes 3 args])
+LB_LINUX_TRY_COMPILE([
+       #include <linux/sunrpc/cache.h>
+],[
+       sunrpc_cache_pipe_upcall(NULL, NULL, NULL);
+],[
+       AC_DEFINE(HAVE_SUNRPC_UPCALL_HAS_3ARGS, 1,
+               [sunrpc_cache_pipe_upcall takes 3 args])
+       AC_MSG_RESULT([yes])
+],[
+       AC_MSG_RESULT([no])
+])
+])
+
 #
 # 3.9 uses hlist_for_each_entry with 3 args
 # b67bfe0d42cac56c512dd5da4b1b347a23f4b70a
@@ -1261,21 +1292,144 @@ LB_LINUX_TRY_COMPILE([
 ])
 
 #
-# 3.9 killed f_vfsmnt by
-# 182be684784334598eee1d90274e7f7aa0063616
-# replacement is f_path.mnt
+# 3.10+ only supports procfs seq_files handling
 #
-AC_DEFUN([LC_HAVE_F_PATH_MNT],
-[AC_MSG_CHECKING([if struct file has f_path.mnt])
+AC_DEFUN([LC_HAVE_ONLY_PROCFS_SEQ],
+[AC_MSG_CHECKING([if procfs only supports using seq_files])
+LB_LINUX_TRY_COMPILE([
+       #include <linux/proc_fs.h>
+],[
+       ((struct proc_dir_entry *)0)->write_proc(NULL, NULL, 0, NULL);
+],[
+       AC_MSG_RESULT([no])
+],[
+       AC_DEFINE(HAVE_ONLY_PROCFS_SEQ, 1, [only seq_files supported])
+       AC_MSG_RESULT([yes])
+])
+])
+
+# 3.10 release for block device doesn't return int
+AC_DEFUN([LC_BLKDEV_RELEASE_RETURN_INT],
+[AC_MSG_CHECKING([if block_device_operations release returns int])
+LB_LINUX_TRY_COMPILE([
+       #include <linux/blkdev.h>
+],[
+       struct block_device_operations fops;
+       int i __attribute__ ((unused));
+
+       i = fops.release(NULL,0);
+],[
+       AC_MSG_RESULT([yes])
+       AC_DEFINE(HAVE_BLKDEV_RELEASE_RETURN_INT, 1,
+                 [block device release returns int])
+],[
+       AC_MSG_RESULT([no])
+])
+])
+
+#
+# 3.11 invalidatepage requires the length of the range to invalidate
+#
+AC_DEFUN([LC_INVALIDATE_RANGE],
+[AC_MSG_CHECKING([if address_space_operations.invalidatepage requires 3 arguments])
 LB_LINUX_TRY_COMPILE([
        #include <linux/fs.h>
 ],[
-       struct file *fp = NULL;
-       struct path  path;
+       struct address_space_operations a_ops;
 
-       path.mnt = fp->f_path.mnt;
+       a_ops.invalidatepage(NULL,0,0);
 ],[
-       AC_DEFINE(HAVE_F_PATH_MNT,1,[yes])
+       AC_DEFINE(HAVE_INVALIDATE_RANGE, 1, [address_space_operations.invalidatepage needs 3 arguments])
+       AC_MSG_RESULT([yes])
+],[
+       AC_MSG_RESULT([no])
+])
+])
+
+#
+# 3.11 readdir now takes the new struct dir_context
+#
+AC_DEFUN([LC_HAVE_DIR_CONTEXT],
+[AC_MSG_CHECKING([if dir_context exist])
+LB_LINUX_TRY_COMPILE([
+       #include <linux/fs.h>
+],[
+       struct dir_context ctx;
+
+       ctx.pos = 0;
+],[
+       AC_DEFINE(HAVE_DIR_CONTEXT, 1, [dir_context exist])
+       AC_MSG_RESULT([yes])
+],[
+       AC_MSG_RESULT([no])
+])
+])
+
+#
+# 3.11 dentry_operations.d_compare() taken 5 arguments.
+#
+AC_DEFUN([LC_D_COMPARE_5ARGS],
+[AC_MSG_CHECKING([if d_compare taken 5 arguments])
+LB_LINUX_TRY_COMPILE([
+       #include <linux/dcache.h>
+],[
+       ((struct dentry_operations*)0)->d_compare(NULL,NULL,0,NULL,NULL);
+],[
+       AC_DEFINE(HAVE_D_COMPARE_5ARGS, 1,
+               [d_compare need 5 arguments])
+       AC_MSG_RESULT([yes])
+],[
+       AC_MSG_RESULT([no])
+])
+])
+
+#
+# 3.11 need to access d_count to get dentry reference count
+#
+AC_DEFUN([LC_HAVE_DCOUNT],
+[AC_MSG_CHECKING([if d_count exist])
+LB_LINUX_TRY_COMPILE([
+       #include <linux/dcache.h>
+],[
+       struct dentry de;
+
+       d_count(&de);
+],[
+       AC_DEFINE(HAVE_D_COUNT, 1, [d_count exist])
+       AC_MSG_RESULT([yes])
+],[
+       AC_MSG_RESULT([no])
+])
+])
+
+#
+# 3.12 truncate_pagecache without oldsize parameter
+#
+AC_DEFUN([LC_OLDSIZE_TRUNCATE_PAGECACHE],
+[AC_MSG_CHECKING([if truncate_pagecache with old_size parameter])
+LB_LINUX_TRY_COMPILE([
+       #include <linux/mm.h>
+],[
+       truncate_pagecache(NULL, 0, 0);
+],[
+       AC_DEFINE(HAVE_OLDSIZE_TRUNCATE_PAGECACHE, 1, [with oldsize])
+       AC_MSG_RESULT([yes])
+],[
+       AC_MSG_RESULT([no])
+])
+])
+
+#
+# 3.12 ki_left removed from struct kiocb
+#
+AC_DEFUN([LC_KIOCB_KI_LEFT],
+[AC_MSG_CHECKING([if struct kiocb with ki_left member])
+LB_LINUX_TRY_COMPILE([
+       #include <linux/aio.h>
+],[
+       ((struct kiocb*)0)->ki_left = 0;
+],[
+       AC_DEFINE(HAVE_KIOCB_KI_LEFT, 1, [ki_left exist])
        AC_MSG_RESULT([yes])
 ],[
        AC_MSG_RESULT([no])
@@ -1296,19 +1450,13 @@ AC_DEFUN([LC_PROG_LINUX],
          LC_CONFIG_LRU_RESIZE
          LC_LLITE_LLOOP_MODULE
 
-         LC_CAPA_CRYPTO
-         LC_CONFIG_RMTCLIENT
-         LC_CONFIG_GSS
-
-         # 2.6.24
-         LC_BIO_ENDIO_2ARG
-         LC_PROCFS_DELETED
-
-         # 2.6.27.15-2 sles11
-         LC_HAVE_QUOTAIO_H
+        LC_GLIBC_SUPPORT_FHANDLES
+        LC_CAPA_CRYPTO
+        LC_CONFIG_RMTCLIENT
+        LC_CONFIG_GSS
 
-         # 2.6.32
-         LC_BLK_QUEUE_MAX_SEGMENTS
+        # 2.6.32
+        LC_BLK_QUEUE_MAX_SEGMENTS
 
         # 2.6.34
         LC_HAVE_DQUOT_FS_DISK_QUOTA
@@ -1334,9 +1482,11 @@ AC_DEFUN([LC_PROG_LINUX],
          LC_D_COMPARE_7ARGS
          LC_D_DELETE_CONST
 
-         # 2.6.39
-         LC_REQUEST_QUEUE_UNPLUG_FN
+        # 2.6.39
+        LC_REQUEST_QUEUE_UNPLUG_FN
+        LC_HAVE_FHANDLE_SYSCALLS
         LC_HAVE_FSTYPE_MOUNT
+        LC_IOP_TRUNCATE
 
         # 3.0
         LC_DIRTY_INODE_WITH_FLAG
@@ -1357,9 +1507,9 @@ AC_DEFUN([LC_PROG_LINUX],
         LC_MIGRATEPAGE_4ARGS
         LC_SUPEROPS_USE_DENTRY
         LC_INODEOPS_USE_UMODE_T
+        LC_HAVE_CACHE_REGISTER
 
         # 3.4
-        LC_TOUCH_ATIME_1ARG
         LC_HAVE_D_MAKE_ROOT
         LC_KMAP_ATOMIC_HAS_1ARG
 
@@ -1378,10 +1528,24 @@ AC_DEFUN([LC_PROG_LINUX],
 
         # 3.8
         LC_HAVE_FILE_F_INODE
+        LC_HAVE_SUNRPC_UPCALL_HAS_3ARGS
 
         # 3.9
         LC_HAVE_HLIST_FOR_EACH_3ARG
-        LC_HAVE_F_PATH_MNT
+
+        # 3.10
+        LC_HAVE_ONLY_PROCFS_SEQ
+        LC_BLKDEV_RELEASE_RETURN_INT
+
+        # 3.11
+        LC_INVALIDATE_RANGE
+        LC_HAVE_DIR_CONTEXT
+        LC_D_COMPARE_5ARGS
+        LC_HAVE_DCOUNT
+
+        # 3.12
+        LC_OLDSIZE_TRUNCATE_PAGECACHE
+        LC_KIOCB_KI_LEFT
 
         #
         if test x$enable_server != xno ; then
@@ -1536,6 +1700,23 @@ fi
 ])
 
 #
+# LC_CONFIG_NODEMAP_PROC_DEBUG
+#
+# enable nodemap proc file debugging
+#
+AC_DEFUN([LC_NODEMAP_PROC_DEBUG],
+[AC_MSG_CHECKING([whether to enable nodemap proc debug])
+AC_ARG_ENABLE([nodemap_proc_debug],
+        AC_HELP_STRING([--enable-nodemap-proc-debug],
+                        [enable nodemap proc debug]),
+        [],[enable_nodemap_proc_debug='no'])
+AC_MSG_RESULT([$enable_nodemap_proc_debug])
+if test x$enable_nodemap_proc_debug != xno; then
+   AC_DEFINE(NODEMAP_PROC_DEBUG, 1, [enable nodemap proc debug support])
+fi
+])
+
+#
 # LC_LLITE_LLOOP_MODULE
 # lloop_llite.ko does not currently work with page sizes
 # of 64k or larger.
@@ -1646,9 +1827,14 @@ AC_CHECK_LIB([z],
                                [ZLIB="-lz"
                                 AC_DEFINE([HAVE_ADLER], 1,
                                           [support alder32 checksum type])],
-                               [AC_MSG_WARN([No zlib-devel package found,
-                                             unable to use adler32 checksum])])],
-             [AC_MSG_WARN([No zlib package found, unable to use adler32 checksum])]
+                               [AC_MSG_WARN([
+
+No zlib-devel package found, unable to use adler32 checksum
+])])],
+             [AC_MSG_WARN([
+
+No zlib package found, unable to use adler32 checksum
+])]
 )
 AC_SUBST(ZLIB)
 
@@ -1659,11 +1845,14 @@ AC_CHECK_LIB([selinux],
                                [SELINUX="-lselinux"
                                AC_DEFINE([HAVE_SELINUX], 1,
                                                [support for selinux ])],
-                               [AC_MSG_WARN([No selinux-devel package found,
-                                               unable to build selinux enabled
-                                               tools])])],
-               [AC_MSG_WARN([No selinux package found, unable to build selinux
-                               enabled tools])]
+                               [AC_MSG_WARN([
+
+No selinux-devel package found, unable to build selinux enabled tools
+])])],
+               [AC_MSG_WARN([
+
+No selinux package found, unable to build selinux enabled tools
+])]
 )
 AC_SUBST(SELINUX)
 
@@ -1785,6 +1974,8 @@ lustre/lfsck/Makefile
 lustre/lfsck/autoMakefile
 lustre/mdt/Makefile
 lustre/mdt/autoMakefile
+lustre/nodemap/Makefile
+lustre/nodemap/autoMakefile
 lustre/mdd/Makefile
 lustre/mdd/autoMakefile
 lustre/fld/Makefile