From: Dmitry Eremin Date: Wed, 19 Feb 2014 13:44:51 +0000 (+0400) Subject: LU-3953 build: configure output improvments X-Git-Tag: 2.5.57~41 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=84bcd1360516a4684a686d8e5f0b59b3ab231c6e;hp=bfae5a4e4a37e4057200bcc70dbff14e18a00797 LU-3953 build: configure output improvments Cleanup from mess in configure output and multi-line messages. Signed-off-by: Dmitry Eremin Change-Id: If90b0962f1b44f28af41e30015cc2ab253d6b83e Reviewed-on: http://review.whamcloud.com/9309 Tested-by: Jenkins Reviewed-by: Bob Glossman Tested-by: Maloo Reviewed-by: Brian J. Murrell Reviewed-by: Oleg Drokin --- diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4 index f50373c..e06527e 100644 --- a/config/lustre-build-ldiskfs.m4 +++ b/config/lustre-build-ldiskfs.m4 @@ -116,8 +116,11 @@ AC_ARG_WITH([ldiskfs], [], [AC_MSG_WARN([--with-ldiskfs is deprecated, please use --enable-ldiskfs]) AS_IF([test x$withval != xyes -a x$withval != xno], - [AC_MSG_ERROR([the ldiskfs option is deprecated, and - no longer supports paths to external ldiskfs source])]) + [AC_MSG_ERROR([ + +The ldiskfs option is deprecated, +and no longer supports paths to external ldiskfs source +])]) ] ) @@ -200,7 +203,6 @@ Disabling ldiskfs support because complete ext4 source does not exist. If you are building using kernel-devel packages and require ldiskfs server support then ensure that the matching kernel-debuginfo-common and kernel-debuginfo-common- packages are installed. - ]) fi diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4 index 894101c..416cb66 100644 --- a/config/lustre-build-linux.m4 +++ b/config/lustre-build-linux.m4 @@ -56,13 +56,16 @@ AC_DEFUN([LB_LINUX_UTSRELEASE], [ ${utsrelease}) AS_IF([test -z "$UTS_RELEASE"], [ AC_MSG_RESULT([Not found]) - AC_MSG_ERROR([*** Cannot determine kernel version.]) + AC_MSG_ERROR([Cannot determine kernel version.]) ]) ], [ AC_MSG_RESULT([Not found]) AC_MSG_ERROR([ - *** Cannot find UTS_RELEASE definition. - *** This is often provided by the kernel-devel package.]) + +Cannot find UTS_RELEASE definition. + +This is often provided by the kernel-devel package. +]) ]) AC_MSG_RESULT([${UTS_RELEASE}]) @@ -234,7 +237,13 @@ AC_ARG_WITH([kernel-source-header], # ------------ .config exists ---------------- LB_CHECK_FILE([$LINUX_CONFIG],[], - [AC_MSG_ERROR([Kernel config could not be found. If you are building from a kernel-source rpm consult build/README.kernel-source])]) + [AC_MSG_ERROR([ + +Kernel config could not be found. + +If you are building from a kernel-source rpm consult build/README.kernel-source +]) +]) # ----------- make dep run? ------------------ # at 2.6.19 # $LINUX/include/linux/config.h is removed @@ -272,9 +281,13 @@ if grep rhconfig $LINUX_OBJ/include/$VERSION_HDIR/version.h >/dev/null ; then # modules LB_CHECK_FILE([$KERNEL_SOURCE_HEADER], [if test $KERNEL_SOURCE_HEADER = '/boot/kernel.h' ; then - AC_MSG_WARN([Using /boot/kernel.h from RUNNING kernel.]) - AC_MSG_WARN([If this is not what you want, use --with-kernel-source-header.]) - AC_MSG_WARN([Consult build/README.kernel-source for details.]) + AC_MSG_WARN([ + +Using /boot/kernel.h from RUNNING kernel. + +If this is not what you want, use --with-kernel-source-header. +Consult build/README.kernel-source for details. +]) fi], [AC_MSG_ERROR([$KERNEL_SOURCE_HEADER not found. Consult build/README.kernel-source for details.])]) EXTRA_KCFLAGS="-include $KERNEL_SOURCE_HEADER $EXTRA_KCFLAGS" @@ -290,9 +303,13 @@ LB_LINUX_TRY_COMPILE([],[],[ AC_MSG_RESULT([yes]) ],[ AC_MSG_RESULT([no]) - AC_MSG_WARN([Consult config.log for details.]) - AC_MSG_WARN([If you are trying to build with a kernel-source rpm, consult build/README.kernel-source]) - AC_MSG_ERROR([Kernel modules cannot be built.]) + AC_MSG_ERROR([ + +Kernel modules cannot be built. Consult config.log for details. + +If you are trying to build with a kernel-source rpm, +consult build/README.kernel-source +]) ]) LB_LINUX_RELEASE @@ -494,9 +511,10 @@ LB_LINUX_TRY_MAKE([ [kernel module loading is possible]) ],[ AC_MSG_RESULT(no) - AC_MSG_WARN([]) - AC_MSG_WARN([Kernel module loading support is highly recommended.]) - AC_MSG_WARN([]) + AC_MSG_WARN([ + +Kernel module loading support is highly recommended. +]) ]) ]) @@ -512,13 +530,19 @@ LB_LINUX_SYMVERFILE LB_LINUX_CONFIG([MODULES],[],[ - AC_MSG_ERROR([module support is required to build Lustre kernel modules.]) + AC_MSG_ERROR([ + +module support is required to build Lustre kernel modules. +]) ]) LB_LINUX_CONFIG([MODVERSIONS]) LB_LINUX_CONFIG([KALLSYMS],[],[ - AC_MSG_ERROR([Lustre requires that CONFIG_KALLSYMS is enabled in your kernel.]) + AC_MSG_ERROR([ + +Lustre requires that CONFIG_KALLSYMS is enabled in your kernel. +]) ]) # 2.6.28 diff --git a/config/lustre-build.m4 b/config/lustre-build.m4 index be67e2d..4cea28b 100644 --- a/config/lustre-build.m4 +++ b/config/lustre-build.m4 @@ -106,7 +106,12 @@ elif test -f META; then msg="$BUILDID (from META file)" AC_MSG_RESULT([$msg]) else - AC_MSG_WARN([FIXME: I don't know how to deal with source trees outside of git that don't have a META file. Not setting a buildid.]) + AC_MSG_RESULT([none]) + AC_MSG_WARN([ + +FIXME: I don't know how to deal with source trees outside of git that +don't have a META file. Not setting a buildid. +]) fi AC_SUBST(BUILDID) ]) diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4 index 2857e17..840bff7 100644 --- a/libcfs/autoconf/lustre-libcfs.m4 +++ b/libcfs/autoconf/lustre-libcfs.m4 @@ -243,18 +243,15 @@ LB_LINUX_TRY_COMPILE([ # upstream commit 56b31d1c9f1e6a3ad92e7bfe252721e05d92b285 # AC_DEFUN([LIBCFS_SOCK_ALLOC_FILE], -[AC_MSG_CHECKING([sock_alloc_file is exported]) -LB_CHECK_SYMBOL_EXPORT([sock_alloc_file], [net/socket.c],[ +[LB_CHECK_SYMBOL_EXPORT([sock_alloc_file], [net/socket.c],[ LB_LINUX_TRY_COMPILE([ #include ],[ sock_alloc_file(NULL, 0, NULL); ],[ - AC_MSG_RESULT(yes) AC_DEFINE(HAVE_SOCK_ALLOC_FILE_3ARGS, 1, [sock_alloc_file takes 3 arguments]) ],[ - AC_MSG_RESULT(yes) AC_DEFINE(HAVE_SOCK_ALLOC_FILE, 1, [sock_alloc_file is exported]) ]) @@ -275,8 +272,10 @@ AC_DEFUN([LIBCFS_ENABLE_CRC32_ACCEL], [enable_crc32_crypto=false],[enable_crc32_crypto=true]) if test x$have_crc32 = xtrue -a x$enable_crc32_crypto = xtrue; then 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 +]) fi ]) @@ -285,8 +284,10 @@ AC_DEFUN([LIBCFS_ENABLE_CRC32C_ACCEL], [enable_crc32c_crypto=false],[enable_crc32c_crypto=true]) if test x$enable_crc32c_crypto = xtrue; then 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 +]) fi ]) @@ -457,7 +458,6 @@ 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]), @@ -466,22 +466,20 @@ if test "$enable_libpthread" = "yes" ; then 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 - AC_MSG_RESULT([$ENABLE_LIBPTHREAD]) PTHREAD_LIBS="-lpthread" AC_DEFINE([HAVE_LIBPTHREAD], 1, [use libpthread]) else PTHREAD_LIBS="" - AC_MSG_RESULT([no libpthread is found]) fi AC_SUBST(PTHREAD_LIBS) else - AC_MSG_RESULT([no (disabled explicitly)]) + AC_MSG_WARN([Using libpthread for libcfs library is disabled explicitly]) ENABLE_LIBPTHREAD="no" fi AC_SUBST(ENABLE_LIBPTHREAD) - - ]) # diff --git a/lustre/autoconf/kerberos5.m4 b/lustre/autoconf/kerberos5.m4 index 1a712a1..fd54549 100644 --- a/lustre/autoconf/kerberos5.m4 +++ b/lustre/autoconf/kerberos5.m4 @@ -67,9 +67,15 @@ AC_DEFUN([AC_KERBEROS_V5],[ dnl We didn't find a usable Kerberos environment if test "x$require_krb5" = "xyes" -a "x$KRBDIR" = "x"; then if test "x$krb5_with" = "x"; then - AC_MSG_ERROR(Kerberos v5 with GSS support not found: consider --disable-gss or --with-krb5=) + AC_MSG_ERROR([ + +Kerberos v5 with GSS support not found: consider --disable-gss or --with-krb5= +]) else - AC_MSG_ERROR(Kerberos v5 with GSS support not found at $krb5_with) + AC_MSG_ERROR([ + +Kerberos v5 with GSS support not found at $krb5_with +]) fi fi AC_MSG_RESULT($KRBDIR) @@ -111,11 +117,19 @@ AC_DEFUN([AC_KERBEROS_V5],[ AS_IF([test "x$HAVE_KRB5INT_DERIVE_KEY" = "x1" -o "x$HAVE_KRB5_DERIVE_KEY" = "x1"], [AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries])], - [KRBDIR=""; AC_MSG_WARN(Disable gss/krb5 due to missing both krb5int_derive_key and krb5_derive_key functions!)]) + [KRBDIR=""; AC_MSG_WARN([ + +Disable gss/krb5 due to missing both +krb5int_derive_key and krb5_derive_key functions! +]) +]) dnl If they specified a directory and it didn't work, give them a warning if test "x$krb5_with" != "x" -a "$krb5_with" != "$KRBDIR"; then - AC_MSG_WARN(Using $KRBDIR instead of requested value of $krb5_with for Kerberos!) + AC_MSG_WARN([ + +Using $KRBDIR instead of requested value of $krb5_with for Kerberos! +]) fi AC_SUBST([KRBDIR]) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 9a347d9..e8802dc 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -83,14 +83,11 @@ AC_TRY_COMPILE([ ]) AC_DEFUN([LC_GLIBC_SUPPORT_FHANDLES], -[AC_MSG_CHECKING([if file handle and related syscalls are supported by glibc]) -AC_CHECK_FUNCS([name_to_handle_at -],[ - AC_MSG_RESULT([yes]) +[AC_CHECK_FUNCS([name_to_handle_at],[ AC_DEFINE(HAVE_FHANDLE_GLIBC_SUPPORT, 1, [file handle and related syscalls are supported]) ],[ - AC_MSG_RESULT([no]) + AC_MSG_WARN([file handle and related syscalls are not supported]) ]) ]) @@ -269,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. +]) ]) ]) @@ -287,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 @@ -309,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]) ]) @@ -353,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 @@ -433,7 +454,6 @@ LB_LINUX_TRY_COMPILE([ AC_MSG_RESULT([yes]) ],[ AC_MSG_RESULT([no]) - AC_MSG_CHECKING([if quotactl_ops.set_dqblk takes struct kqid&fs_disk_quota]) ]) ]) EXTRA_KCFLAGS="$tmp_flags" @@ -1807,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) @@ -1820,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)