X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Fautoconf%2Flustre-libcfs.m4;h=90bb1c10e4bc1960a7f79d121690809d4106c425;hp=815f0827ec07e79a1c45bd9cbbd9a5a8a12f6953;hb=5655ee76f5c7573c9ad076a92df6388f27b65196;hpb=99727c7a1a4f4100361f79bf185cb34b70b67d99 diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4 index 815f082..90bb1c1 100644 --- a/libcfs/autoconf/lustre-libcfs.m4 +++ b/libcfs/autoconf/lustre-libcfs.m4 @@ -3,251 +3,235 @@ # # whether to enable various libcfs debugs (CDEBUG, ENTRY/EXIT, LASSERT, etc.) # -AC_DEFUN([LN_CONFIG_CDEBUG], -[ +AC_DEFUN([LN_CONFIG_CDEBUG], [ AC_MSG_CHECKING([whether to enable CDEBUG, CWARN]) AC_ARG_ENABLE([libcfs_cdebug], AC_HELP_STRING([--disable-libcfs-cdebug], - [disable libcfs CDEBUG, CWARN]), - [],[enable_libcfs_cdebug='yes']) + [disable libcfs CDEBUG, CWARN]), + [], [enable_libcfs_cdebug="yes"]) AC_MSG_RESULT([$enable_libcfs_cdebug]) -if test x$enable_libcfs_cdebug = xyes; then - AC_DEFINE(CDEBUG_ENABLED, 1, [enable libcfs CDEBUG, CWARN]) -fi +AS_IF([test "x$enable_libcfs_cdebug" = xyes], + [AC_DEFINE(CDEBUG_ENABLED, 1, [enable libcfs CDEBUG, CWARN])]) AC_MSG_CHECKING([whether to enable ENTRY/EXIT]) AC_ARG_ENABLE([libcfs_trace], AC_HELP_STRING([--disable-libcfs-trace], - [disable libcfs ENTRY/EXIT]), - [],[enable_libcfs_trace='yes']) + [disable libcfs ENTRY/EXIT]), + [], [enable_libcfs_trace="yes"]) AC_MSG_RESULT([$enable_libcfs_trace]) -if test x$enable_libcfs_trace = xyes; then - AC_DEFINE(CDEBUG_ENTRY_EXIT, 1, [enable libcfs ENTRY/EXIT]) -fi +AS_IF([test "x$enable_libcfs_trace" = xyes], + [AC_DEFINE(CDEBUG_ENTRY_EXIT, 1, [enable libcfs ENTRY/EXIT])]) AC_MSG_CHECKING([whether to enable LASSERT, LASSERTF]) AC_ARG_ENABLE([libcfs_assert], AC_HELP_STRING([--disable-libcfs-assert], - [disable libcfs LASSERT, LASSERTF]), - [],[enable_libcfs_assert='yes']) + [disable libcfs LASSERT, LASSERTF]), + [], [enable_libcfs_assert="yes"]) AC_MSG_RESULT([$enable_libcfs_assert]) -if test x$enable_libcfs_assert = xyes; then - AC_DEFINE(LIBCFS_DEBUG, 1, [enable libcfs LASSERT, LASSERTF]) -fi -]) +AS_IF([test x$enable_libcfs_assert = xyes], + [AC_DEFINE(LIBCFS_DEBUG, 1, [enable libcfs LASSERT, LASSERTF])]) +]) # LN_CONFIG_CDEBUG # # LIBCFS_CONFIG_PANIC_DUMPLOG # # check if tunable panic_dumplog is wanted # -AC_DEFUN([LIBCFS_CONFIG_PANIC_DUMPLOG], -[AC_MSG_CHECKING([for tunable panic_dumplog support]) +AC_DEFUN([LIBCFS_CONFIG_PANIC_DUMPLOG], [ +AC_MSG_CHECKING([whether to use tunable 'panic_dumplog' support]) AC_ARG_ENABLE([panic_dumplog], - AC_HELP_STRING([--enable-panic_dumplog], - [enable panic_dumplog]), - [],[enable_panic_dumplog='no']) -if test x$enable_panic_dumplog = xyes ; then - AC_DEFINE(LNET_DUMP_ON_PANIC, 1, [use dumplog on panic]) - AC_MSG_RESULT([yes (by request)]) -else - AC_MSG_RESULT([no]) -fi -]) - -# check kernel __u64 type -AC_DEFUN([LIBCFS_U64_LONG_LONG_LINUX], -[ -AC_MSG_CHECKING([kernel __u64 is long long type]) -tmp_flags="$EXTRA_KCFLAGS" -EXTRA_KCFLAGS="$EXTRA_KCFLAGS -Werror" -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - unsigned long long *data; + AC_HELP_STRING([--enable-panic_dumplog], + [enable panic_dumplog]), + [], [enable_panic_dumplog="no"]) +AC_MSG_RESULT([$enable_panic_dumplog]) +AS_IF([test "x$enable_panic_dumplog" = xyes], + [AC_DEFINE(LNET_DUMP_ON_PANIC, 1, [use dumplog on panic])]) +]) # LIBCFS_CONFIG_PANIC_DUMPLOG - data = (__u64*)sizeof(data); +# +# LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK +# +# 2.6.32-30.el6 adds a new 'walk_stack' field in 'struct stacktrace_ops' +# +AC_DEFUN([LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK], [ +LB_CHECK_COMPILE([if 'struct stacktrace_ops' has 'walk_stack' field], +stacktrace_ops_walk_stack, [ + #include ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_KERN__U64_LONG_LONG, 1, - [kernel __u64 is long long type]) + ((struct stacktrace_ops *)0)->walk_stack(NULL, NULL, 0, NULL, NULL, NULL, NULL); ],[ - AC_MSG_RESULT([no]) -]) -EXTRA_KCFLAGS="$tmp_flags" + AC_DEFINE(STACKTRACE_OPS_HAVE_WALK_STACK, 1, + ['struct stacktrace_ops' has 'walk_stack' field]) ]) +]) # LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK # -# LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK +# LIBCFS_STACKTRACE_WARNING # -# 2.6.32-30.el6 adds a new 'walk_stack' field in 'struct stacktrace_ops' +# 3.0 removes stacktrace_ops warning* functions # -AC_DEFUN([LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK], -[AC_MSG_CHECKING([if 'struct stacktrace_ops' has 'walk_stack' field]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - ((struct stacktrace_ops *)0)->walk_stack(NULL, NULL, 0, NULL, NULL, NULL, NULL); +AC_DEFUN([LIBCFS_STACKTRACE_WARNING], [ +LB_CHECK_COMPILE([if 'stacktrace_ops.warning' is exist], +stacktrace_ops_warning, [ + struct task_struct; + struct pt_regs; + #include ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(STACKTRACE_OPS_HAVE_WALK_STACK, 1, ['struct stacktrace_ops' has 'walk_stack' field]) + ((struct stacktrace_ops *)0)->warning(NULL, NULL); ],[ - AC_MSG_RESULT([no]) -]) + AC_DEFINE(HAVE_STACKTRACE_WARNING, 1, + [stacktrace_ops.warning is exist]) ]) +]) # LIBCFS_STACKTRACE_WARNING # +# LC_SHRINKER_WANT_SHRINK_PTR +# # RHEL6/2.6.32 want to have pointer to shrinker self pointer in handler function # -AC_DEFUN([LC_SHRINKER_WANT_SHRINK_PTR], -[AC_MSG_CHECKING([shrinker want self pointer in handler]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct shrinker *tmp = NULL; - tmp->shrink(tmp, 0, 0); +AC_DEFUN([LC_SHRINKER_WANT_SHRINK_PTR], [ +LB_CHECK_COMPILE([if 'shrinker' want self pointer in handler], +shrink_self_pointer, [ + #include ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SHRINKER_WANT_SHRINK_PTR, 1, - [shrinker want self pointer in handler]) + struct shrinker *tmp = NULL; + tmp->shrink(tmp, 0, 0); ],[ - AC_MSG_RESULT(no) -]) + AC_DEFINE(HAVE_SHRINKER_WANT_SHRINK_PTR, 1, + [shrinker want self pointer in handler]) ]) +]) # LC_SHRINKER_WANT_SHRINK_PTR # +# LIBCFS_SYSCTL_CTLNAME +# # 2.6.33 no longer has ctl_name & strategy field in struct ctl_table. # -AC_DEFUN([LIBCFS_SYSCTL_CTLNAME], -[AC_MSG_CHECKING([if ctl_table has a ctl_name field]) -LB_LINUX_TRY_COMPILE([ - #include +AC_DEFUN([LIBCFS_SYSCTL_CTLNAME], [ +LB_CHECK_COMPILE([if 'ctl_table' has a 'ctl_name' field], +ctl_table_ctl_name, [ + #include ],[ - struct ctl_table ct; - ct.ctl_name = sizeof(ct); + struct ctl_table ct; + ct.ctl_name = sizeof(ct); ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SYSCTL_CTLNAME, 1, - [ctl_table has ctl_name field]) -],[ - AC_MSG_RESULT(no) -]) + AC_DEFINE(HAVE_SYSCTL_CTLNAME, 1, + [ctl_table has ctl_name field]) ]) +]) # LIBCFS_SYSCTL_CTLNAME # # LIBCFS_ADD_WAIT_QUEUE_EXCLUSIVE # # 2.6.34 adds __add_wait_queue_exclusive # -AC_DEFUN([LIBCFS_ADD_WAIT_QUEUE_EXCLUSIVE], -[AC_MSG_CHECKING([if __add_wait_queue_exclusive exists]) -LB_LINUX_TRY_COMPILE([ - #include +AC_DEFUN([LIBCFS_ADD_WAIT_QUEUE_EXCLUSIVE], [ +LB_CHECK_COMPILE([if '__add_wait_queue_exclusive' exists], +__add_wait_queue_exclusive, [ + #include ],[ - wait_queue_head_t queue; - wait_queue_t wait; - - __add_wait_queue_exclusive(&queue, &wait); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE___ADD_WAIT_QUEUE_EXCLUSIVE, 1, - [__add_wait_queue_exclusive exists]) + wait_queue_head_t queue; + wait_queue_t wait; + __add_wait_queue_exclusive(&queue, &wait); ],[ - AC_MSG_RESULT(no) -]) + AC_DEFINE(HAVE___ADD_WAIT_QUEUE_EXCLUSIVE, 1, + [__add_wait_queue_exclusive exists]) ]) +]) # LIBCFS_ADD_WAIT_QUEUE_EXCLUSIVE # +# LC_SK_SLEEP +# # 2.6.35 kernel has sk_sleep function # -AC_DEFUN([LC_SK_SLEEP], -[AC_MSG_CHECKING([if kernel has sk_sleep]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - sk_sleep(NULL); +AC_DEFUN([LC_SK_SLEEP], [ +LB_CHECK_COMPILE([if Linux kernel has 'sk_sleep'], +sk_sleep, [ + #include ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SK_SLEEP, 1, [kernel has sk_sleep]) + sk_sleep(NULL); ],[ - AC_MSG_RESULT(no) -],[ -]) + AC_DEFINE(HAVE_SK_SLEEP, 1, + [kernel has sk_sleep]) ]) +]) # LC_SK_SLEEP +# +# LIBCFS_DUMP_TRACE_ADDRESS +# # 2.6.39 adds a base pointer address argument to dump_trace -AC_DEFUN([LIBCFS_DUMP_TRACE_ADDRESS], -[AC_MSG_CHECKING([dump_trace want address]) -LB_LINUX_TRY_COMPILE([ +# +AC_DEFUN([LIBCFS_DUMP_TRACE_ADDRESS], [ +LB_CHECK_COMPILE([if 'dump_trace' want address], +dump_trace_address, [ struct task_struct; struct pt_regs; #include ],[ dump_trace(NULL, NULL, NULL, 0, NULL, NULL); ],[ - AC_MSG_RESULT(yes) AC_DEFINE(HAVE_DUMP_TRACE_ADDRESS, 1, [dump_trace want address argument]) -],[ - AC_MSG_RESULT(no) -],[ -]) ]) +]) # LIBCFS_DUMP_TRACE_ADDRESS # +# LC_SHRINK_CONTROL +# # FC15 2.6.40-5 backported the "shrink_control" parameter to the memory # pressure shrinker from Linux 3.0 # -AC_DEFUN([LC_SHRINK_CONTROL], -[AC_MSG_CHECKING([shrink_control is present]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct shrink_control tmp = {0}; - tmp.nr_to_scan = sizeof(tmp); +AC_DEFUN([LC_SHRINK_CONTROL], [ +LB_CHECK_COMPILE([if 'shrink_control' is present], +shrink_control, [ + #include ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SHRINK_CONTROL, 1, - [shrink_control is present]) + struct shrink_control tmp = {0}; + tmp.nr_to_scan = sizeof(tmp); ],[ - AC_MSG_RESULT(no) -]) + AC_DEFINE(HAVE_SHRINK_CONTROL, 1, + [shrink_control is present]) ]) +]) # LC_SHRINK_CONTROL -# 3.0 removes stacktrace_ops warning* functions -AC_DEFUN([LIBCFS_STACKTRACE_WARNING], -[AC_MSG_CHECKING([whether stacktrace_ops.warning is exist]) -LB_LINUX_TRY_COMPILE([ - struct task_struct; - struct pt_regs; - #include -],[ - ((struct stacktrace_ops *)0)->warning(NULL, NULL); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_STACKTRACE_WARNING, 1, [stacktrace_ops.warning is exist]) +# +# LIBCFS_PROCESS_NAMESPACE +# +# 3.5 introduced process namespace +AC_DEFUN([LIBCFS_PROCESS_NAMESPACE], [ +LB_CHECK_LINUX_HEADER([linux/uidgid.h], [ + AC_DEFINE(HAVE_UIDGID_HEADER, 1, + [uidgid.h is present])]) +]) # LIBCFS_PROCESS_NAMESPACE + +# +# LIBCFS_I_UID_READ +# +# 3.5 added helpers to read the new uid/gid types from VFS structures +# SLE11 SP3 has uidgid.h but not the helpers +# +AC_DEFUN([LIBCFS_I_UID_READ], [ +LB_CHECK_COMPILE([if 'i_uid_read' is present], +i_uid_read, [ + #include ],[ - AC_MSG_RESULT(no) + i_uid_read(NULL); ],[ + AC_DEFINE(HAVE_I_UID_READ, 1, [i_uid_read is present]) ]) -]) - -# 3.4 introduced process namespace -AC_DEFUN([LIBCFS_PROCESS_NAMESPACE],[ -LB_CHECK_LINUX_HEADER([linux/uidgid.h], [ - AC_DEFINE(HAVE_UIDGID_HEADER, 1, [uidgid.h is present]) -]) -]) +]) # LIBCFS_I_UID_READ # +# LIBCFS_SOCK_ALLOC_FILE +# # FC18 3.7.2-201 unexport sock_map_fd() change to # use sock_alloc_file(). # upstream commit 56b31d1c9f1e6a3ad92e7bfe252721e05d92b285 # -AC_DEFUN([LIBCFS_SOCK_ALLOC_FILE], -[LB_CHECK_SYMBOL_EXPORT([sock_alloc_file], [net/socket.c],[ - LB_LINUX_TRY_COMPILE([ +AC_DEFUN([LIBCFS_SOCK_ALLOC_FILE], [ +LB_CHECK_EXPORT([sock_alloc_file], [net/socket.c], [ + LB_CHECK_COMPILE([if 'sock_alloc_file' takes 3 arguments], + sock_alloc_file_3args, [ #include ],[ sock_alloc_file(NULL, 0, NULL); @@ -258,52 +242,74 @@ AC_DEFUN([LIBCFS_SOCK_ALLOC_FILE], AC_DEFINE(HAVE_SOCK_ALLOC_FILE, 1, [sock_alloc_file is exported]) ]) -],[ -]) ]) +]) # LIBCFS_SOCK_ALLOC_FILE -AC_DEFUN([LIBCFS_HAVE_CRC32], -[LB_LINUX_CONFIG_IM([CRC32], - [have_crc32=true],[have_crc32=false]) -if test x$have_crc32 = xtrue; then - AC_DEFINE(HAVE_CRC32, 1, [kernel compiled with CRC32 functions]) -fi -]) +# +# LIBCFS_HAVE_CRC32 +# +AC_DEFUN([LIBCFS_HAVE_CRC32], [ +LB_CHECK_CONFIG_IM([CRC32], + [have_crc32="yes"], [have_crc32="no"]) +AS_IF([test "x$have_crc32" = xyes], + [AC_DEFINE(HAVE_CRC32, 1, + [kernel compiled with CRC32 functions])]) +]) # LIBCFS_HAVE_CRC32 -AC_DEFUN([LIBCFS_ENABLE_CRC32_ACCEL], -[LB_LINUX_CONFIG_IM([CRYPTO_CRC32_PCLMUL], - [enable_crc32_crypto=false],[enable_crc32_crypto=true]) -if test x$have_crc32 = xtrue -a x$enable_crc32_crypto = xtrue; then +# +# LIBCFS_ENABLE_CRC32_ACCEL +# +AC_DEFUN([LIBCFS_ENABLE_CRC32_ACCEL], [ +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 -]) -fi -]) +])]) +]) # LIBCFS_ENABLE_CRC32_ACCEL -AC_DEFUN([LIBCFS_ENABLE_CRC32C_ACCEL], -[LB_LINUX_CONFIG_IM([CRYPTO_CRC32C_INTEL], - [enable_crc32c_crypto=false],[enable_crc32c_crypto=true]) -if test x$enable_crc32c_crypto = xtrue; then +# +# LIBCFS_ENABLE_CRC32C_ACCEL +# +AC_DEFUN([LIBCFS_ENABLE_CRC32C_ACCEL], [ +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 +])]) +]) # LIBCFS_ENABLE_CRC32C_ACCEL + +# +# FC19 3.12 kernel struct shrinker change +# +AC_DEFUN([LIBCFS_SHRINKER_COUNT],[ +LB_CHECK_COMPILE([shrinker has 'count_objects'], +shrinker_count_objects, [ + #include + #include +],[ + ((struct shrinker*)0)->count_objects(NULL, NULL); +],[ + AC_DEFINE(HAVE_SHRINKER_COUNT, 1, + [shrinker has count_objects memeber]) ]) -fi ]) # # LIBCFS_PROG_LINUX # -# LNet linux kernel checks +# LibCFS linux kernel checks # -AC_DEFUN([LIBCFS_PROG_LINUX], -[ +AC_DEFUN([LIBCFS_PROG_LINUX], [ +AC_MSG_NOTICE([LibCFS kernel checks +==============================================================================]) LIBCFS_CONFIG_PANIC_DUMPLOG -LIBCFS_U64_LONG_LONG_LINUX # 2.6.32 LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK LC_SHRINKER_WANT_SHRINK_PTR @@ -319,8 +325,9 @@ LIBCFS_DUMP_TRACE_ADDRESS LC_SHRINK_CONTROL # 3.0 LIBCFS_STACKTRACE_WARNING -# 3.4 +# 3.5 LIBCFS_PROCESS_NAMESPACE +LIBCFS_I_UID_READ # 3.7 LIBCFS_SOCK_ALLOC_FILE # 3.8 @@ -328,33 +335,28 @@ LIBCFS_HAVE_CRC32 LIBCFS_ENABLE_CRC32_ACCEL # 3.10 LIBCFS_ENABLE_CRC32C_ACCEL -]) - -# -# LIBCFS_PROG_DARWIN -# -# Darwin checks -# -AC_DEFUN([LIBCFS_PROG_DARWIN], -[LB_DARWIN_CHECK_FUNCS([get_preemption_level]) -]) +# 3.12 +LIBCFS_SHRINKER_COUNT +]) # LIBCFS_PROG_LINUX # # LIBCFS_PATH_DEFAULTS # # default paths for installed files # -AC_DEFUN([LIBCFS_PATH_DEFAULTS], -[ -]) +AC_DEFUN([LIBCFS_PATH_DEFAULTS], [ +]) # LIBCFS_PATH_DEFAULTS # # LIBCFS_CONFIGURE # # other configure checks # -AC_DEFUN([LIBCFS_CONFIGURE], -[# lnet/utils/portals.c +AC_DEFUN([LIBCFS_CONFIGURE], [ +AC_MSG_NOTICE([LibCFS core checks +==============================================================================]) + +# lnet/utils/portals.c AC_CHECK_HEADERS([asm/types.h endian.h sys/ioctl.h]) # lnet/utils/debug.c @@ -374,138 +376,67 @@ AC_CHECK_FUNCS([strlcpy]) # libcfs/libcfs/user-prim.c, missing for RHEL5 and earlier userspace AC_CHECK_FUNCS([strlcat]) -AC_CHECK_TYPE([umode_t], - [AC_DEFINE(HAVE_UMODE_T, 1, [umode_t is defined])], - [], - [#include ]) - -AC_CHECK_TYPE([__s8], - [AC_DEFINE(HAVE___S8, 1, [__s8 is defined])], - [], - [#include ]) - -AC_CHECK_TYPE([__u8], - [AC_DEFINE(HAVE___U8, 1, [__u8 is defined])], - [], - [#include ]) - -AC_CHECK_TYPE([__s16], - [AC_DEFINE(HAVE___S16, 1, [__s16 is defined])], - [], - [#include ]) - -AC_CHECK_TYPE([__u16], - [AC_DEFINE(HAVE___U16, 1, [__u16 is defined])], - [], - [#include ]) - -AC_CHECK_TYPE([__s32], - [AC_DEFINE(HAVE___S32, 1, [__s32 is defined])], - [], - [#include ]) - -AC_CHECK_TYPE([__u32], - [AC_DEFINE(HAVE___U32, 1, [__u32 is defined])], - [], - [#include ]) - -AC_CHECK_TYPE([__u64], - [AC_DEFINE(HAVE___U64, 1, [__u64 is defined])], - [], - [#include ]) - -AC_CHECK_TYPE([__s64], - [AC_DEFINE(HAVE___S64, 1, [__s64 is defined])], - [], - [#include ]) - -# check userland __u64 type -AC_MSG_CHECKING([userspace __u64 is long long type]) -tmp_flags="$CFLAGS" -CFLAGS="$CFLAGS -Werror" -AC_COMPILE_IFELSE([ - #include - #include - #include - int main(void) { - unsigned long long *data1; - __u64 *data2 = NULL; - - data1 = data2; - data2 = data1; - return 0; - } -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_USER__U64_LONG_LONG, 1, - [__u64 is long long type]) -],[ - AC_MSG_RESULT([no]) -]) -CFLAGS="$tmp_flags" - # -------- Check for required packages -------------- +AC_MSG_NOTICE([LibCFS required packages checks +==============================================================================]) -AC_MSG_CHECKING([if efence debugging support is requested]) +AC_MSG_CHECKING([whether to enable 'efence' debugging support]) AC_ARG_ENABLE(efence, AC_HELP_STRING([--enable-efence], - [use efence library]), - [],[enable_efence='no']) + [use efence library]), + [], [enable_efence="no"]) AC_MSG_RESULT([$enable_efence]) -if test "$enable_efence" = "yes" ; then +AS_IF([test "$enable_efence" = yes], [ LIBEFENCE="-lefence" AC_DEFINE(HAVE_LIBEFENCE, 1, [libefence support is requested]) -else +], [ LIBEFENCE="" -fi +]) AC_SUBST(LIBEFENCE) - # -------- check for -lpthread support ---- + +AC_MSG_CHECKING([whether to use libpthread for libcfs library]) AC_ARG_ENABLE([libpthread], - AC_HELP_STRING([--disable-libpthread], - [disable libpthread]), - [],[enable_libpthread=yes]) -if test "$enable_libpthread" = "yes" ; then + AC_HELP_STRING([--disable-libpthread], + [disable libpthread]), + [], [enable_libpthread="yes"]) +AC_MSG_RESULT([$enable_libpthread]) +AS_IF([test "x$enable_libpthread" = xyes], [ AC_CHECK_LIB([pthread], [pthread_create], [ENABLE_LIBPTHREAD="yes"], [ENABLE_LIBPTHREAD="no"]) - AC_MSG_CHECKING([whether to use libpthread for libcfs library]) - AC_MSG_RESULT([$ENABLE_LIBPTHREAD]) - if test "$ENABLE_LIBPTHREAD" = "yes" ; then + AS_IF([test "$ENABLE_LIBPTHREAD" = yes], [ PTHREAD_LIBS="-lpthread" AC_DEFINE([HAVE_LIBPTHREAD], 1, [use libpthread]) - else + ], [ PTHREAD_LIBS="" - fi + ]) AC_SUBST(PTHREAD_LIBS) -else +], [ AC_MSG_WARN([Using libpthread for libcfs library is disabled explicitly]) ENABLE_LIBPTHREAD="no" -fi -AC_SUBST(ENABLE_LIBPTHREAD) ]) +AC_SUBST(ENABLE_LIBPTHREAD) +]) # LIBCFS_CONFIGURE # # LIBCFS_CONDITIONALS # -# AM_CONDITOINAL defines for lnet -# -AC_DEFUN([LIBCFS_CONDITIONALS], -[ -AM_CONDITIONAL(HAVE_CRC32, test x$have_crc32 = xtrue) -AM_CONDITIONAL(NEED_PCLMULQDQ_CRC32, test x$have_crc32 = xtrue -a x$enable_crc32_crypto = xtrue) -AM_CONDITIONAL(NEED_PCLMULQDQ_CRC32C, test x$enable_crc32c_crypto = xtrue) -]) +AC_DEFUN([LIBCFS_CONDITIONALS], [ +AM_CONDITIONAL(HAVE_CRC32, [test "x$have_crc32" = xyes]) +AM_CONDITIONAL(NEED_PCLMULQDQ_CRC32, [test "x$have_crc32" = xyes -a "x$enable_crc32_crypto" = xyes]) +AM_CONDITIONAL(NEED_PCLMULQDQ_CRC32C, [test "x$enable_crc32c_crypto" = xyes]) +]) # LIBCFS_CONDITIONALS # # LIBCFS_CONFIG_FILES # # files that should be generated with AC_OUTPUT # -AC_DEFUN([LIBCFS_CONFIG_FILES], -[AC_CONFIG_FILES([ +AC_DEFUN([LIBCFS_CONFIG_FILES], [ +AC_CONFIG_FILES([ libcfs/Kernelenv libcfs/Makefile libcfs/autoMakefile @@ -520,7 +451,5 @@ libcfs/libcfs/autoMakefile libcfs/libcfs/linux/Makefile libcfs/libcfs/posix/Makefile libcfs/libcfs/util/Makefile -libcfs/include/libcfs/darwin/Makefile -libcfs/libcfs/darwin/Makefile -]) ]) +]) # LIBCFS_CONFIG_FILES