From: Christopher J. Morrone Date: Sat, 7 May 2016 01:53:07 +0000 (-0700) Subject: LU-8116 build: Cleanup GSS configure script messages X-Git-Tag: 2.8.54~8 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=7f40121f5549acb31a07db02d7aa6a8f5817db5f LU-8116 build: Cleanup GSS configure script messages Some of the GSS configure warning are unnecessarily multi-line, and also redundant. For instance: checking for keyctl_search in -lkeyutils... no configure: WARNING: libkeyutils is not found, which is required by gss keyring backend configure: WARNING: Cannot enable gss keyring. See above for details. Why so many lines? Why the double warning? Also, there is a bug in the "for Kerberos v5" check where it fails to use AC_MSG_RESULT in the negative case. A completely different function winds up appending an AC_MSG_WARN: checking for Kerberos v5... configure: WARNING: not found! This patch addresses those minor issues. Change-Id: Ic9fb8b5687849688d965cc67b394e4eb569204be Signed-off-by: Christopher J. Morrone Reviewed-on: http://review.whamcloud.com/20056 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Minh Diep Reviewed-by: Bob Glossman Reviewed-by: Oleg Drokin --- diff --git a/lustre/autoconf/kerberos5.m4 b/lustre/autoconf/kerberos5.m4 index 0d42daf..9472de6 100644 --- a/lustre/autoconf/kerberos5.m4 +++ b/lustre/autoconf/kerberos5.m4 @@ -141,6 +141,8 @@ Using $KRBDIR instead of requested value of $krb5_with for Kerberos! AC_SUBST([KRBLDFLAGS]) AC_SUBST([K5VERS]) + else + AC_MSG_RESULT([not found!]) fi # "x$KRBDIR" != "x" ]) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index f0373ff..8e04313 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -244,17 +244,11 @@ AC_MSG_RESULT([$enable_gss_keyring]) AS_IF([test "x$enable_gss_keyring" != xno], [ LB_CHECK_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 requires 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([GSS keyring backend requires libkeyutils])]) AS_IF([test "x$gss_keyring_conf_test" != xfail], [ AC_DEFINE([HAVE_GSS_KEYRING], [1], @@ -262,15 +256,7 @@ libkeyutils is not found, which is required by gss keyring backend enable_gss_keyring="yes" ], [ AS_IF([test "x$enable_gss_keyring" = xyes], [ - AC_MSG_ERROR([ - -Cannot enable gss_keyring. See above for details. -]) - ], [ - AC_MSG_WARN([ - -Cannot enable gss keyring. See above for details. -]) + AC_MSG_ERROR([Cannot enable gss_keyring. See above for details.]) ]) ]) ]) @@ -360,7 +346,6 @@ AS_IF([test "x$enable_gss" != xno], [ AS_IF([test -n "$KRBDIR"], [ gss_conf_test="success" ], [ - AC_MSG_WARN([not found!]) gss_conf_test="failure" ])