Whamcloud - gitweb
LU-9399 llite: register mountpoint before process llog
[fs/lustre-release.git] / libcfs / autoconf / lustre-libcfs.m4
index 8b11794..1e6f326 100644 (file)
@@ -1,9 +1,9 @@
 #
-# LN_CONFIG_CDEBUG
+# LIBCFS_CONFIG_CDEBUG
 #
 # whether to enable various libcfs debugs (CDEBUG, ENTRY/EXIT, LASSERT, etc.)
 #
-AC_DEFUN([LN_CONFIG_CDEBUG], [
+AC_DEFUN([LIBCFS_CONFIG_CDEBUG], [
 AC_MSG_CHECKING([whether to enable CDEBUG, CWARN])
 AC_ARG_ENABLE([libcfs_cdebug],
        AC_HELP_STRING([--disable-libcfs-cdebug],
@@ -30,7 +30,7 @@ AC_ARG_ENABLE([libcfs_assert],
 AC_MSG_RESULT([$enable_libcfs_assert])
 AS_IF([test x$enable_libcfs_assert = xyes],
        [AC_DEFINE(LIBCFS_DEBUG, 1, [enable libcfs LASSERT, LASSERTF])])
-]) # LN_CONFIG_CDEBUG
+]) # LIBCFS_CONFIG_CDEBUG
 
 #
 # LIBCFS_CONFIG_PANIC_DUMPLOG
@@ -85,6 +85,22 @@ stacktrace_ops_warning, [
 ]) # LIBCFS_STACKTRACE_WARNING
 
 #
+# LIBCFS_REINIT_COMPLETION
+#
+AC_DEFUN([LIBCFS_REINIT_COMPLETION], [
+LB_CHECK_COMPILE([if 'reinit_completion' exists],
+reinit_completion, [
+       #include <linux/completion.h>
+],[
+       struct completion x;
+       reinit_completion(&x);
+],[
+       AC_DEFINE(HAVE_REINIT_COMPLETION, 1,
+               [reinit_completion is exist])
+])
+]) # LIBCFS_REINIT_COMPLETION
+
+#
 # LC_SHRINKER_WANT_SHRINK_PTR
 #
 # RHEL6/2.6.32 want to have pointer to shrinker self pointer in handler function
@@ -121,21 +137,22 @@ ctl_table_ctl_name, [
 ]) # LIBCFS_SYSCTL_CTLNAME
 
 #
-# LC_SK_SLEEP
+# LIBCFS_KSTRTOUL
 #
-# 2.6.35 kernel has sk_sleep function
+# 2.6.38 kstrtoul is added
 #
-AC_DEFUN([LC_SK_SLEEP], [
-LB_CHECK_COMPILE([if Linux kernel has 'sk_sleep'],
-sk_sleep, [
-       #include <net/sock.h>
+AC_DEFUN([LIBCFS_KSTRTOUL], [
+LB_CHECK_COMPILE([if Linux kernel has 'kstrtoul'],
+kstrtoul, [
+       #include <linux/kernel.h>
 ],[
-       sk_sleep(NULL);
+       unsigned long result;
+       return kstrtoul("12345", 0, &result);
 ],[
-       AC_DEFINE(HAVE_SK_SLEEP, 1,
-               [kernel has sk_sleep])
+       AC_DEFINE(HAVE_KSTRTOUL, 1,
+               [kernel has kstrtoul])
 ])
-]) # LC_SK_SLEEP
+]) # LIBCFS_KSTRTOUL
 
 #
 # LIBCFS_DUMP_TRACE_ADDRESS
@@ -165,6 +182,7 @@ dump_trace_address, [
 AC_DEFUN([LC_SHRINK_CONTROL], [
 LB_CHECK_COMPILE([if 'shrink_control' is present],
 shrink_control, [
+       #include <linux/atomic.h>
        #include <linux/mm.h>
 ],[
        struct shrink_control tmp = {0};
@@ -245,10 +263,7 @@ LB_CHECK_CONFIG_IM([CRYPTO_CRC32_PCLMUL],
        [enable_crc32_crypto="no"], [enable_crc32_crypto="yes"])
 AS_IF([test "x$have_crc32" = xyes -a "x$enable_crc32_crypto" = xyes], [
        AC_DEFINE(NEED_CRC32_ACCEL, 1, [need pclmulqdq based crc32])
-       AC_MSG_WARN([
-
-No crc32 pclmulqdq crypto api found, enable internal pclmulqdq based crc32
-])])
+       AC_MSG_WARN([No crc32 pclmulqdq crypto api found, enable internal pclmulqdq based crc32])])
 ]) # LIBCFS_ENABLE_CRC32_ACCEL
 
 #
@@ -259,13 +274,64 @@ LB_CHECK_CONFIG_IM([CRYPTO_CRC32C_INTEL],
        [enable_crc32c_crypto="no"], [enable_crc32c_crypto="yes"])
 AS_IF([test "x$enable_crc32c_crypto" = xyes], [
        AC_DEFINE(NEED_CRC32C_ACCEL, 1, [need pclmulqdq based crc32c])
-       AC_MSG_WARN([
-
-No crc32c pclmulqdq crypto api found, enable internal pclmulqdq based crc32c
-])])
+       AC_MSG_WARN([No crc32c pclmulqdq crypto api found, enable internal pclmulqdq based crc32c])])
 ]) # LIBCFS_ENABLE_CRC32C_ACCEL
 
 #
+# Kernel version 3.11 introduced ktime_get_ts64
+#
+AC_DEFUN([LIBCFS_KTIME_GET_TS64],[
+LB_CHECK_COMPILE([does function 'ktime_get_ts64' exist],
+ktime_get_ts64, [
+       #include <linux/ktime.h>
+],[
+       struct timespec64 *ts = NULL;
+
+       ktime_get_ts64(ts);
+],[
+       AC_DEFINE(HAVE_KTIME_GET_TS64, 1,
+               ['ktime_get_ts64' is available])
+])
+]) # LIBCFS_KTIME_GET_TS64
+
+#
+# Kernel version 3.12 introduced ktime_add
+#
+AC_DEFUN([LIBCFS_KTIME_ADD],[
+LB_CHECK_COMPILE([does function 'ktime_add' exist],
+ktime_add, [
+       #include <linux/ktime.h>
+],[
+       ktime_t start = ktime_set(0, 0);
+       ktime_t end = start;
+       ktime_t total;
+
+       total = ktime_add(start, end);
+],[
+       AC_DEFINE(HAVE_KTIME_ADD, 1,
+               [ktime_add is available])
+])
+]) # LIBCFS_KTIME_ADD
+
+#
+# Kernel version 3.12 introduced ktime_after
+#
+AC_DEFUN([LIBCFS_KTIME_AFTER],[
+LB_CHECK_COMPILE([does function 'ktime_after' exist],
+ktime_after, [
+       #include <linux/ktime.h>
+],[
+       ktime_t start = ktime_set(0, 0);
+       ktime_t end = start;
+
+       ktime_after(start, end);
+],[
+       AC_DEFINE(HAVE_KTIME_AFTER, 1,
+               [ktime_after is available])
+])
+]) # LIBCFS_KTIME_AFTER
+
+#
 # FC19 3.12 kernel struct shrinker change
 #
 AC_DEFUN([LIBCFS_SHRINKER_COUNT],[
@@ -279,7 +345,330 @@ shrinker_count_objects, [
        AC_DEFINE(HAVE_SHRINKER_COUNT, 1,
                [shrinker has count_objects member])
 ])
+]) # LIBCFS_SHRINKER_COUNT
+
+#
+# Kernel version 3.17 changed hlist_add_after to
+# hlist_add_behind
+#
+AC_DEFUN([LIBCFS_HLIST_ADD_AFTER],[
+LB_CHECK_COMPILE([does function 'hlist_add_after' exist],
+hlist_add_after, [
+       #include <linux/list.h>
+],[
+       hlist_add_after(NULL, NULL);
+],[
+       AC_DEFINE(HAVE_HLIST_ADD_AFTER, 1,
+               [hlist_add_after is available])
+])
+]) # LIBCFS_HLIST_ADD_AFTER
+
+#
+# Kernel version 3.17 introduced struct timespec64
+#
+AC_DEFUN([LIBCFS_TIMESPEC64],[
+LB_CHECK_COMPILE([does 'struct timespec64' exist],
+timespec64, [
+       #include <linux/time.h>
+],[
+       struct timespec64 ts;
+
+       ts.tv_sec = 0;
+       ts.tv_nsec = 0;
+],[
+       AC_DEFINE(HAVE_TIMESPEC64, 1,
+               ['struct timespec64' is available])
+])
+]) # LIBCFS_TIMESPEC64
+
+#
+# Kernel version 3.17 introduced ktime_get_real_ts64
+#
+AC_DEFUN([LIBCFS_KTIME_GET_REAL_TS64],[
+LB_CHECK_COMPILE([does function 'ktime_get_real_ts64' exist],
+ktime_get_real_ts64, [
+       #include <linux/ktime.h>
+],[
+       struct timespec64 *ts = NULL;
+
+       ktime_get_real_ts64(ts);
+],[
+       AC_DEFINE(HAVE_KTIME_GET_REAL_TS64, 1,
+               ['ktime_get_real_ts64' is available])
+])
+]) # LIBCFS_KTIME_GET_REAL_TS64
+
+#
+# Kernel version 3.17 introduced ktime_get_real_seconds
+#
+AC_DEFUN([LIBCFS_KTIME_GET_REAL_SECONDS],[
+LB_CHECK_COMPILE([does function 'ktime_get_real_seconds' exist],
+ktime_get_real_seconds, [
+       #include <linux/ktime.h>
+],[
+       time64_t now;
+
+       now = ktime_get_real_seconds();
+],[
+       AC_DEFINE(HAVE_KTIME_GET_REAL_SECONDS, 1,
+               ['ktime_get_real_seconds' is available])
+])
+]) # LIBCFS_KTIME_GET_REAL_SECONDS
+
+#
+# Kernel version 3.17 created ktime_get_real_ns wrapper
+#
+AC_DEFUN([LIBCFS_KTIME_GET_REAL_NS],[
+LB_CHECK_COMPILE([does function 'ktime_get_real_ns' exist],
+ktime_get_real_ns, [
+       #include <linux/ktime.h>
+],[
+       u64 nanoseconds;
+
+       nanoseconds = ktime_get_real_ns();
+],[],[
+       AC_DEFINE(NEED_KTIME_GET_REAL_NS, 1,
+               ['ktime_get_real_ns' is not available])
+])
+]) # LIBCFS_KTIME_GET_REAL_NS
+
+#
+# Kernel version 3.17 introduced ktime_to_timespec64
+#
+AC_DEFUN([LIBCFS_KTIME_TO_TIMESPEC64],[
+LB_CHECK_COMPILE([does function 'ktime_to_timespec64' exist],
+ktime_to_timespec64, [
+       #include <linux/ktime.h>
+],[
+       struct timespec64 ts;
+       ktime_t now;
+
+       ts = ktime_to_timespec64(now);
+],[
+       AC_DEFINE(HAVE_KTIME_TO_TIMESPEC64, 1,
+               ['ktime_to_timespec64' is available])
+])
+]) # LIBCFS_KTIME_TO_TIMESPEC64
+
+#
+# Kernel version 3.17 introduced timespec64_sub
+#
+AC_DEFUN([LIBCFS_TIMESPEC64_SUB],[
+LB_CHECK_COMPILE([does function 'timespec64_sub' exist],
+timespec64_sub, [
+       #include <linux/time.h>
+],[
+       struct timespec64 later,earlier,diff;
+
+       diff = timespec64_sub(later, earlier);
+],[
+       AC_DEFINE(HAVE_TIMESPEC64_SUB, 1,
+               ['timespec64_sub' is available])
+])
+]) # LIBCFS_TIMESPEC64_SUB
+
+#
+# Kernel version 3.17 introduced timespec64_to_ktime
+#
+AC_DEFUN([LIBCFS_TIMESPEC64_TO_KTIME],[
+LB_CHECK_COMPILE([does function 'timespec64_to_ktime' exist],
+timespec64_to_ktime, [
+       #include <linux/ktime.h>
+],[
+       struct timespec64 ts;
+       ktime_t now;
+
+       now = timespec64_to_ktime(ts);
+],[
+       AC_DEFINE(HAVE_TIMESPEC64_TO_KTIME, 1,
+               ['timespec64_to_ktime' is available])
+])
+]) # LIBCFS_TIMESPEC64_TO_KTIME
+
+#
+# Kernel version 3.19 introduced ktime_get_seconds
+#
+AC_DEFUN([LIBCFS_KTIME_GET_SECONDS],[
+LB_CHECK_COMPILE([does function 'ktime_get_seconds' exist],
+ktime_get_seconds, [
+       #include <linux/ktime.h>
+],[
+       time64_t now;
+
+       now = ktime_get_seconds();
+],[
+       AC_DEFINE(HAVE_KTIME_GET_SECONDS, 1,
+               ['ktime_get_seconds' is available])
+])
+]) # LIBCFS_KTIME_GET_SECONDS
+
+#
+# Kernel version 3.19 commit 5aaba36318e5995e8c95d077a46d9a4d00fcc1cd
+# This patch creates a new helper function cpumap_print_to_pagebuf in
+# cpumask.h using newly added bitmap_print_to_pagebuf and consolidates
+# most of those sysfs functions using the new helper function.
+#
+AC_DEFUN([LIBCFS_HAVE_CPUMASK_PRINT_TO_PAGEBUF],[
+LB_CHECK_COMPILE([does function 'cpumap_print_to_pagebuf' exist],
+cpumap_print_to_pagebuf, [
+       #include <linux/topology.h>
+],[
+       int n;
+       char *buf = NULL;
+       const struct cpumask *mask = NULL;
+       n = cpumap_print_to_pagebuf(true, buf, mask);
+],[
+       AC_DEFINE(HAVE_CPUMASK_PRINT_TO_PAGEBUF, 1,
+               [cpumap_print_to_pagebuf is available])
+])
+]) # LIBCFS_HAVE_CPUMASK_PRINT_TO_PAGEBUF
+
+#
+# Kernel version 4.2 changed topology_thread_cpumask
+# to topology_sibling_cpumask
+#
+AC_DEFUN([LIBCFS_HAVE_TOPOLOGY_SIBLING_CPUMASK],[
+LB_CHECK_COMPILE([does function 'topology_sibling_cpumask' exist],
+topology_sibling_cpumask, [
+       #include <linux/topology.h>
+],[
+       const struct cpumask *mask;
+
+       mask = topology_sibling_cpumask(0);
+],[
+       AC_DEFINE(HAVE_TOPOLOGY_SIBLING_CPUMASK, 1,
+               [topology_sibling_cpumask is available])
 ])
+]) # LIBCFS_HAVE_TOPOLOGY_SIBLING_CPUMASK
+
+#
+# Kernel version 4.2 commit df6b35f409af0a8ff1ef62f552b8402f3fef8665
+# header file i387.h was renamed to fpu/api.h
+#
+AC_DEFUN([LIBCFS_FPU_API], [
+LB_CHECK_LINUX_HEADER([asm/fpu/api.h], [
+       AC_DEFINE(HAVE_FPU_API_HEADER, 1,
+               [fpu/api.h is present])])
+]) # LIBCFS_FPU_API
+
+#
+# Kernel version 4.5-rc1 commit d12481bc58fba89427565f8592e88446ec084a24
+# added crypto hash helpers
+#
+AC_DEFUN([LIBCFS_CRYPTO_HASH_HELPERS], [
+LB_CHECK_COMPILE([does crypto hash helper functions exist],
+crypto_hash_helpers, [
+       #include <crypto/hash.h>
+],[
+       crypto_ahash_alg_name(NULL);
+       crypto_ahash_driver_name(NULL);
+],[
+       AC_DEFINE(HAVE_CRYPTO_HASH_HELPERS, 1,
+               [crypto hash helper functions are available])
+])
+]) # LIBCFS_CRYPTO_HASH_HELPERS
+
+#
+# LIBCFS_STACKTRACE_OPS_ADDRESS_RETURN_INT
+#
+# linux 4.6 kernel changed stacktrace_ops address to return an int
+#
+AC_DEFUN([LIBCFS_STACKTRACE_OPS_ADDRESS_RETURN_INT], [
+LB_CHECK_COMPILE([if 'struct stacktrace_ops' address function returns an int],
+stacktrace_ops_address_return_int, [
+       #include <asm/stacktrace.h>
+],[
+       int rc;
+
+       rc = ((struct stacktrace_ops *)0)->address(NULL, 0, 0);
+],[
+       AC_DEFINE(STACKTRACE_OPS_ADDRESS_RETURN_INT, 1,
+               ['struct stacktrace_ops' address function returns an int])
+])
+]) # LIBCFS_STACKTRACE_OPS_ADDRESS_RETURN_INT
+
+#
+# Kernel version 4.6 removed both struct task_struct and struct mm_struct
+# arguments to get_user_pages
+#
+AC_DEFUN([LIBCFS_GET_USER_PAGES_6ARG], [
+LB_CHECK_COMPILE([if 'get_user_pages()' takes 6 arguments],
+get_user_pages_6arg, [
+       #include <linux/mm.h>
+],[
+       int rc;
+
+       rc = get_user_pages(0, 0, 0, 0, NULL, NULL);
+],[
+       AC_DEFINE(HAVE_GET_USER_PAGES_6ARG, 1,
+               [get_user_pages takes 6 arguments])
+])
+]) # LIBCFS_GET_USER_PAGES_6ARG
+
+#
+# LIBCFS_STACKTRACE_OPS
+#
+# Kernel version 4.8 commit c8fe4609827aedc9c4b45de80e7cdc8ccfa8541b
+# removed both struct stacktrace_ops and dump_trace() function
+#
+AC_DEFUN([LIBCFS_STACKTRACE_OPS], [
+LB_CHECK_COMPILE([if 'struct stacktrace_ops' exists],
+stacktrace_ops, [
+       struct task_struct;
+       struct pt_regs;
+       #include <asm/stacktrace.h>
+],[
+       struct stacktrace_ops ops;
+       ops.stack = NULL;
+],[
+       AC_DEFINE(HAVE_STACKTRACE_OPS, 1,
+               [struct stacktrace_ops exists])
+])
+]) # LIBCFS_STACKTRACE_OPS
+
+#
+# Kernel version 4.9 commit 768ae309a96103ed02eb1e111e838c87854d8b51
+# mm: replace get_user_pages() write/force parameters with gup_flags
+#
+AC_DEFUN([LIBCFS_GET_USER_PAGES_GUP_FLAGS], [
+LB_CHECK_COMPILE([if 'get_user_pages()' takes gup_flags in arguments],
+get_user_pages_gup_flags, [
+       #include <linux/mm.h>
+],[
+       int rc;
+       rc = get_user_pages(0, 0, FOLL_WRITE, NULL, NULL);
+],[
+       AC_DEFINE(HAVE_GET_USER_PAGES_GUP_FLAGS, 1,
+               [get_user_pages takes gup_flags in arguments])
+])
+]) # LIBCFS_GET_USER_PAGES_GUP_FLAGS
+
+#
+# Kernel version 4.10 commit 7b737965b33188bd3dbb44e938535c4006d97fbb
+# libcfs: Convert to hotplug state machine
+#
+AC_DEFUN([LIBCFS_HOTPLUG_STATE_MACHINE], [
+LB_CHECK_COMPILE([if libcfs supports CPU hotplug state machine],
+cpu_hotplug_state_machine, [
+       #include <linux/cpuhotplug.h>
+],[
+       cpuhp_remove_state(CPUHP_LUSTRE_CFS_DEAD);
+],[
+       AC_DEFINE(HAVE_HOTPLUG_STATE_MACHINE, 1,
+               [hotplug state machine is supported])
+])
+]) # LIBCFS_HOTPLUG_STATE_MACHINE
+
+#
+# LIBCFS_SCHED_HEADERS
+#
+# 4.11 has broken up sched.h into more headers.
+#
+AC_DEFUN([LIBCFS_SCHED_HEADERS], [
+LB_CHECK_LINUX_HEADER([linux/sched/signal.h], [
+       AC_DEFINE(HAVE_SCHED_HEADERS, 1,
+               [linux/sched header directory exist])])
+]) # LIBCFS_SCHED_HEADERS
 
 #
 # LIBCFS_PROG_LINUX
@@ -296,14 +685,15 @@ LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK
 LC_SHRINKER_WANT_SHRINK_PTR
 # 2.6.33
 LIBCFS_SYSCTL_CTLNAME
-# 2.6.35
-LC_SK_SLEEP
+# 2.6.38
+LIBCFS_KSTRTOUL
 # 2.6.39
 LIBCFS_DUMP_TRACE_ADDRESS
 # 2.6.40 fc15
 LC_SHRINK_CONTROL
 # 3.0
 LIBCFS_STACKTRACE_WARNING
+LIBCFS_REINIT_COMPLETION
 # 3.5
 LIBCFS_PROCESS_NAMESPACE
 LIBCFS_I_UID_READ
@@ -314,8 +704,40 @@ LIBCFS_HAVE_CRC32
 LIBCFS_ENABLE_CRC32_ACCEL
 # 3.10
 LIBCFS_ENABLE_CRC32C_ACCEL
+# 3.11
+LIBCFS_KTIME_GET_TS64
 # 3.12
+LIBCFS_KTIME_ADD
+LIBCFS_KTIME_AFTER
 LIBCFS_SHRINKER_COUNT
+# 3.17
+LIBCFS_HLIST_ADD_AFTER
+LIBCFS_TIMESPEC64
+LIBCFS_KTIME_GET_REAL_TS64
+LIBCFS_KTIME_GET_REAL_SECONDS
+LIBCFS_KTIME_GET_REAL_NS
+LIBCFS_KTIME_TO_TIMESPEC64
+LIBCFS_TIMESPEC64_SUB
+LIBCFS_TIMESPEC64_TO_KTIME
+# 3.19
+LIBCFS_KTIME_GET_SECONDS
+LIBCFS_HAVE_CPUMASK_PRINT_TO_PAGEBUF
+# 4.2
+LIBCFS_HAVE_TOPOLOGY_SIBLING_CPUMASK
+LIBCFS_FPU_API
+# 4.5
+LIBCFS_CRYPTO_HASH_HELPERS
+# 4.6
+LIBCFS_STACKTRACE_OPS_ADDRESS_RETURN_INT
+LIBCFS_GET_USER_PAGES_6ARG
+# 4.8
+LIBCFS_STACKTRACE_OPS
+# 4.9
+LIBCFS_GET_USER_PAGES_GUP_FLAGS
+# 4.10
+LIBCFS_HOTPLUG_STATE_MACHINE
+# 4.11
+LIBCFS_SCHED_HEADERS
 ]) # LIBCFS_PROG_LINUX
 
 #
@@ -355,26 +777,43 @@ AC_CHECK_FUNCS([strlcpy])
 # libcfs/libcfs/user-prim.c, missing for RHEL5 and earlier userspace
 AC_CHECK_FUNCS([strlcat])
 
+# libcfs/include/libcfs/linux/linux-prim.h, ...
+AC_CHECK_HEADERS([linux/types.h sys/types.h linux/unistd.h unistd.h])
+
+# libcfs/include/libcfs/linux/linux-prim.h
+AC_CHECK_HEADERS([linux/random.h], [], [],
+                [#ifdef HAVE_LINUX_TYPES_H
+                 #include <linux/types.h>
+                 #endif
+                ])
+
+# libcfs/include/libcfs/linux/libcfs.h
+# libcfs/include/libcfs/byteorder.h
+# libcfs/libcfs/util/nidstrings.c
+AC_CHECK_HEADERS([netdb.h asm/types.h endian.h])
+AC_CHECK_FUNCS([gethostbyname])
+
 # --------  Check for required packages  --------------
 
 AC_MSG_NOTICE([LibCFS required packages checks
 ==============================================================================])
 
-AC_MSG_CHECKING([whether to enable 'efence' debugging support])
-AC_ARG_ENABLE(efence,
-       AC_HELP_STRING([--enable-efence],
-               [use efence library]),
-       [], [enable_efence="no"])
-AC_MSG_RESULT([$enable_efence])
-AS_IF([test "$enable_efence" = yes], [
-       LIBEFENCE="-lefence"
-       AC_DEFINE(HAVE_LIBEFENCE, 1, [libefence support is requested])
-], [
-       LIBEFENCE=""
+AC_MSG_CHECKING([whether to enable readline support])
+AC_ARG_ENABLE(readline,
+       AC_HELP_STRING([--disable-readline],
+               [disable readline support]),
+       [], [enable_readline="yes"])
+AC_MSG_RESULT([$enable_readline])
+
+LIBREADLINE=""
+AS_IF([test "x$enable_readline" = xyes], [
+       AC_CHECK_LIB([readline], [readline], [
+               LIBREADLINE="-lreadline"
+               AC_DEFINE(HAVE_LIBREADLINE, 1,
+                       [readline library is available])
+       ])
 ])
-AC_SUBST(LIBEFENCE)
-
-# -------- check for -lpthread support ----
+AC_SUBST(LIBREADLINE)
 
 AC_MSG_CHECKING([whether to use libpthread for libcfs library])
 AC_ARG_ENABLE([libpthread],
@@ -382,22 +821,18 @@ AC_ARG_ENABLE([libpthread],
                [disable libpthread]),
        [], [enable_libpthread="yes"])
 AC_MSG_RESULT([$enable_libpthread])
+
+PTHREAD_LIBS=""
 AS_IF([test "x$enable_libpthread" = xyes], [
-       AC_CHECK_LIB([pthread], [pthread_create],
-               [ENABLE_LIBPTHREAD="yes"],
-               [ENABLE_LIBPTHREAD="no"])
-       AS_IF([test "$ENABLE_LIBPTHREAD" = yes], [
+       AC_CHECK_LIB([pthread], [pthread_create], [
                PTHREAD_LIBS="-lpthread"
-               AC_DEFINE([HAVE_LIBPTHREAD], 1, [use libpthread])
-       ], [
-               PTHREAD_LIBS=""
+               AC_DEFINE([HAVE_LIBPTHREAD], 1,
+                       [use libpthread for libcfs library])
        ])
-       AC_SUBST(PTHREAD_LIBS)
 ], [
        AC_MSG_WARN([Using libpthread for libcfs library is disabled explicitly])
-       ENABLE_LIBPTHREAD="no"
 ])
-AC_SUBST(ENABLE_LIBPTHREAD)
+AC_SUBST(PTHREAD_LIBS)
 ]) # LIBCFS_CONFIGURE
 
 #