Cleanup from mess in configure output and multi-line messages.
Signed-off-by: Dmitry Eremin <dmitry.eremin@intel.com>
Change-Id: If90b0962f1b44f28af41e30015cc2ab253d6b83e
Reviewed-on: http://review.whamcloud.com/9309
Tested-by: Jenkins
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Brian J. Murrell <brian.murrell@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
[],
[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
+])])
]
)
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-<arch> packages are installed.
-
])
fi
${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}])
# ------------ .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
# 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"
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
[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.
+])
])
])
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
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)
])
# 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 <linux/net.h>
],[
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])
])
[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
])
[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
])
# -------- 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]),
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)
-
-
])
#
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)
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])
])
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])
])
])
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.
+])
])
])
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
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])
])
[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
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"
[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)
[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)
git://git.whamcloud.com / fs / lustre-release.git / commitdiff