From 6cfdad3fc2f40c8e05bbc94803654229fb8ab1b0 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Mon, 6 Jun 2022 00:12:43 -0700 Subject: [PATCH] LU-15838 autoconf: fix use of obsolete macros This patch fixes the following warnings when using autoconf 2.71: configure.ac:2: warning: AC_INIT: not a literal: "m4_esyscmd(sh -c "./LUSTRE-VERSION-GEN | tr -d '\n'")" configure.ac:10: warning: The macro `AC_CANONICAL_SYSTEM' is obsolete. configure.ac:16: warning: The macro `AC_PROG_LIBTOOL' is obsolete. configure.ac:24: warning: The macro `AC_HELP_STRING' is obsolete. Like m4_esyscmd, macro m4_esyscmd_s (introduced in autoconf 2.64) expands to the result of running command in a shell. The difference is that any trailing newlines are removed. Since autoconf 2.50, macro 'AC_CANONICAL_TARGET' has been the new name of 'AC_CANONICAL_SYSTEM': AU_ALIAS([AC_CANONICAL_SYSTEM], [AC_CANONICAL_TARGET]) Since autoconf 2.58, macro 'AS_HELP_STRING' has been added to replace 'AC_HELP_STRING'. Since libtool 2.0, new 'LT_INIT' interface has been added to replace 'AC_PROG_LIBTOOL'. Lustre-change: https://review.whamcloud.com/47288 Lustre-commit: TBD (from a94a730df48089e3ffbf853af78a2444dc5a3042) Change-Id: I3c06c21460d7a2cf643fe825e72a26a5416609cf Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/47539 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- config/lustre-build-ldiskfs.m4 | 4 ++-- config/lustre-build-linux.m4 | 10 +++++----- config/lustre-build.m4 | 24 ++++++++++++------------ configure.ac | 6 +++--- libcfs/autoconf/lustre-libcfs.m4 | 12 ++++++------ lipe/configure.ac | 6 +++--- lnet/autoconf/lustre-lnet.m4 | 10 +++++----- lustre.spec.in | 4 ++-- lustre/autoconf/kerberos5.m4 | 2 +- lustre/autoconf/lustre-core.m4 | 36 ++++++++++++++++++------------------ snmp/autoconf/lustre-snmp.m4 | 2 +- 11 files changed, 58 insertions(+), 58 deletions(-) diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4 index 1ecd43a..ed72c43 100644 --- a/config/lustre-build-ldiskfs.m4 +++ b/config/lustre-build-ldiskfs.m4 @@ -301,7 +301,7 @@ EXTRA_KCFLAGS="$tmp_flags" # AC_DEFUN([LDISKFS_AC_PATCH_PROGRAM], [ AC_ARG_ENABLE([quilt], - [AC_HELP_STRING([--disable-quilt], + [AS_HELP_STRING([--disable-quilt], [disable use of quilt for ldiskfs])], [AS_IF([test "x$enableval" = xno], [use_quilt=no], @@ -574,7 +574,7 @@ LB_VALIDATE_EXT4_SRC_DIR AC_DEFUN([LB_DEFINE_E2FSPROGS_NAMES], [ AC_MSG_CHECKING([whether to use alternate names for e2fsprogs]) AC_ARG_WITH([ldiskfsprogs], - AC_HELP_STRING([--with-ldiskfsprogs], + AS_HELP_STRING([--with-ldiskfsprogs], [use alternate names for ldiskfs-enabled e2fsprogs]), [], [withval="no"]) diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4 index 7e74b1a..4ff771d 100644 --- a/config/lustre-build-linux.m4 +++ b/config/lustre-build-linux.m4 @@ -158,7 +158,7 @@ AC_DEFUN([LB_LINUX_RELEASE], [ AC_MSG_CHECKING([for Linux kernel module package directory]) AC_ARG_WITH([kmp-moddir], - AC_HELP_STRING([--with-kmp-moddir=string], + AS_HELP_STRING([--with-kmp-moddir=string], [set the kmod updates or extra directory]), [KMP_MODDIR=$withval IN_KERNEL=''],[ @@ -256,7 +256,7 @@ done AC_MSG_CHECKING([for Linux sources]) AC_ARG_WITH([linux], - AC_HELP_STRING([--with-linux=path], + AS_HELP_STRING([--with-linux=path], [set path to Linux source (default=/lib/modules/$(uname -r)/{source,build},/usr/src/linux)]), [LB_ARG_CANON_PATH([linux], [LINUX]) DEFAULT_LINUX_OBJ=$LINUX], @@ -271,7 +271,7 @@ LB_CHECK_FILE([$LINUX], [], # -------- linux objects (for 2.6) -- AC_MSG_CHECKING([for Linux objects]) AC_ARG_WITH([linux-obj], - AC_HELP_STRING([--with-linux-obj=path], + AS_HELP_STRING([--with-linux-obj=path], [set path to Linux objects (default=/lib/modules/$(uname -r)/build,/usr/src/linux)]), [LB_ARG_CANON_PATH([linux-obj], [LINUX_OBJ])], [LINUX_OBJ=$DEFAULT_LINUX_OBJ]) @@ -280,7 +280,7 @@ AC_SUBST(LINUX_OBJ) # -------- check for .config -------- AC_ARG_WITH([linux-config], - [AC_HELP_STRING([--with-linux-config=path], + [AS_HELP_STRING([--with-linux-config=path], [set path to Linux .conf (default=$LINUX_OBJ/.config)])], [LB_ARG_CANON_PATH([linux-config], [LINUX_CONFIG])], [LINUX_CONFIG=$LINUX_OBJ/.config]) @@ -300,7 +300,7 @@ LB_CHECK_FILE([/boot/kernel.h], [KERNEL_SOURCE_HEADER='/var/adm/running-kernel.h'])]) AC_ARG_WITH([kernel-source-header], - AC_HELP_STRING([--with-kernel-source-header=path], + AS_HELP_STRING([--with-kernel-source-header=path], [Use a different kernel version header.]), [LB_ARG_CANON_PATH([kernel-source-header], [KERNEL_SOURCE_HEADER])]) diff --git a/config/lustre-build.m4 b/config/lustre-build.m4 index b10dcbe..065d212 100644 --- a/config/lustre-build.m4 +++ b/config/lustre-build.m4 @@ -49,7 +49,7 @@ AC_DEFUN([LB_ARG_LIBS_INCLUDES], [ lb_pathvar="m4_bpatsubst([$2], -, _)" AC_MSG_CHECKING([for $1]) AC_ARG_WITH([$2], - AC_HELP_STRING([--with-$2=path], + AS_HELP_STRING([--with-$2=path], [path to $1]), [], [withval=$4]) AS_IF([test "x$withval" = xyes], @@ -60,7 +60,7 @@ AC_MSG_RESULT([${!lb_pathvar:-no}]) AS_IF([test "x${!lb_pathvar}" != x -a "x${!lb_pathvar}" != xno], [ AC_MSG_CHECKING([for $1 includes]) AC_ARG_WITH([$2-includes], - AC_HELP_STRING([--with-$2-includes=path], + AS_HELP_STRING([--with-$2-includes=path], [path to $1 includes]), [], [withval="yes"]) @@ -72,7 +72,7 @@ AS_IF([test "x${!lb_pathvar}" != x -a "x${!lb_pathvar}" != xno], [ AC_MSG_CHECKING([for $1 libs]) AC_ARG_WITH([$2-libs], - AC_HELP_STRING([--with-$2-libs=path], + AS_HELP_STRING([--with-$2-libs=path], [path to $1 libs]), [], [withval="yes"]) @@ -92,7 +92,7 @@ AS_IF([test "x${!lb_pathvar}" != x -a "x${!lb_pathvar}" != xno], [ AC_DEFUN([LB_PATH_LUSTREIOKIT], [ AC_MSG_CHECKING([whether to build iokit]) AC_ARG_ENABLE([iokit], - AC_HELP_STRING([--disable-iokit], + AS_HELP_STRING([--disable-iokit], [disable iokit (default is enable)]), [], [enable_iokit="yes"]) AC_MSG_RESULT([$enable_iokit]) @@ -133,7 +133,7 @@ AS_IF([test "x$with_libmount" = xyes], [ AC_DEFUN([LB_PATH_PUMOUNT], [ AC_MSG_CHECKING([whether to build pumount]) AC_ARG_ENABLE([pumount], - AC_HELP_STRING([--disable-pumount], + AS_HELP_STRING([--disable-pumount], [disable pumount (default is enable)]), [], [enable_pumount="yes"]) AC_MSG_RESULT([$enable_pumount]) @@ -163,7 +163,7 @@ AC_SUBST(SNMP_SUBDIR) AC_DEFUN([LB_CONFIG_MODULES], [ AC_MSG_CHECKING([whether to build Linux kernel modules]) AC_ARG_ENABLE([modules], - AC_HELP_STRING([--disable-modules], + AS_HELP_STRING([--disable-modules], [disable building of Lustre kernel modules]), [], [ LC_TARGET_SUPPORTED([enable_modules="yes"], @@ -212,7 +212,7 @@ AS_IF([test "x$enable_modules" = xyes], [ AC_DEFUN([LB_CONFIG_UTILS], [ AC_MSG_CHECKING([whether to build Lustre utilities]) AC_ARG_ENABLE([utils], - AC_HELP_STRING([--disable-utils], + AS_HELP_STRING([--disable-utils], [disable building of Lustre utility programs]), [], [enable_utils="yes"]) AC_MSG_RESULT([$enable_utils]) @@ -226,7 +226,7 @@ AC_MSG_RESULT([$enable_utils]) AC_DEFUN([LB_CONFIG_TESTS], [ AC_MSG_CHECKING([whether to build Lustre tests]) AC_ARG_ENABLE([tests], - AC_HELP_STRING([--disable-tests], + AS_HELP_STRING([--disable-tests], [disable building of Lustre tests]), [], [enable_tests="yes"]) @@ -255,7 +255,7 @@ AC_MSG_RESULT([$enable_tests]) AC_DEFUN([LB_CONFIG_DIST], [ AC_MSG_CHECKING([whether to configure just enough for make dist]) AC_ARG_ENABLE([dist], - AC_HELP_STRING([--enable-dist], + AS_HELP_STRING([--enable-dist], [only configure enough for make dist]), [], [enable_dist="no"]) AC_MSG_RESULT([$enable_dist]) @@ -275,7 +275,7 @@ AS_IF([test "x$enable_dist" != xno], [ AC_DEFUN([LB_CONFIG_DOCS], [ AC_MSG_CHECKING([whether to build Lustre docs]) AC_ARG_ENABLE([doc], - AC_HELP_STRING([--disable-doc], + AS_HELP_STRING([--disable-doc], [skip creation of pdf documentation]), [], [enable_doc="no"]) AC_MSG_RESULT([$enable_doc]) @@ -292,7 +292,7 @@ AC_SUBST(ENABLE_DOC) AC_DEFUN([LB_CONFIG_MANPAGES], [ AC_MSG_CHECKING([whether to build Lustre manpages]) AC_ARG_ENABLE([manpages], - AC_HELP_STRING([--disable-manpages], + AS_HELP_STRING([--disable-manpages], [skip creation and inclusion of man pages (default is enable)]), [], [enable_manpages="yes"]) AC_MSG_RESULT([$enable_manpages]) @@ -496,7 +496,7 @@ AC_DEFUN([LB_CONFIG_FILES], [ # AC_DEFUN([LB_CONFIG_SERVERS], [ AC_ARG_ENABLE([server], - AC_HELP_STRING([--disable-server], + AS_HELP_STRING([--disable-server], [disable Lustre server support]), [ AS_IF([test x$enable_server != xyes -a x$enable_server != xno], [AC_MSG_ERROR([server valid options are "yes" or "no"])]) diff --git a/configure.ac b/configure.ac index ea8aea7..af63f99 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([Lustre], m4_esyscmd([sh -c "./LUSTRE-VERSION-GEN | tr -d '\n'"]), +AC_INIT([Lustre], m4_esyscmd_s([./LUSTRE-VERSION-GEN]), [https://jira.whamcloud.com/], [lustre]) AC_CONFIG_AUX_DIR([config]) @@ -7,13 +7,13 @@ AC_CONFIG_MACRO_DIR([config]) LC_CONFIG_SRCDIR -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([1.10 tar-pax -Wno-portability subdir-objects]) AM_MAINTAINER_MODE([enable]) AC_PROG_CC -AC_PROG_LIBTOOL +LT_INIT AC_PROG_MKDIR_P AM_PROG_AS diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4 index 77e6ce1..cc6b5c1 100644 --- a/libcfs/autoconf/lustre-libcfs.m4 +++ b/libcfs/autoconf/lustre-libcfs.m4 @@ -6,7 +6,7 @@ AC_DEFUN([LIBCFS_CONFIG_CDEBUG], [ AC_MSG_CHECKING([whether to enable CDEBUG, CWARN]) AC_ARG_ENABLE([libcfs_cdebug], - AC_HELP_STRING([--disable-libcfs-cdebug], + AS_HELP_STRING([--disable-libcfs-cdebug], [disable libcfs CDEBUG, CWARN]), [], [enable_libcfs_cdebug="yes"]) AC_MSG_RESULT([$enable_libcfs_cdebug]) @@ -15,7 +15,7 @@ AS_IF([test "x$enable_libcfs_cdebug" = xyes], AC_MSG_CHECKING([whether to enable ENTRY/EXIT]) AC_ARG_ENABLE([libcfs_trace], - AC_HELP_STRING([--disable-libcfs-trace], + AS_HELP_STRING([--disable-libcfs-trace], [disable libcfs ENTRY/EXIT]), [], [enable_libcfs_trace="yes"]) AC_MSG_RESULT([$enable_libcfs_trace]) @@ -24,7 +24,7 @@ AS_IF([test "x$enable_libcfs_trace" = xyes], AC_MSG_CHECKING([whether to enable LASSERT, LASSERTF]) AC_ARG_ENABLE([libcfs_assert], - AC_HELP_STRING([--disable-libcfs-assert], + AS_HELP_STRING([--disable-libcfs-assert], [disable libcfs LASSERT, LASSERTF]), [], [enable_libcfs_assert="yes"]) AC_MSG_RESULT([$enable_libcfs_assert]) @@ -40,7 +40,7 @@ AS_IF([test x$enable_libcfs_assert = xyes], 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], + AS_HELP_STRING([--enable-panic_dumplog], [enable panic_dumplog]), [], [enable_panic_dumplog="no"]) AC_MSG_RESULT([$enable_panic_dumplog]) @@ -1833,7 +1833,7 @@ AC_MSG_NOTICE([LibCFS required packages checks AC_MSG_CHECKING([whether to enable readline support]) AC_ARG_ENABLE(readline, - AC_HELP_STRING([--disable-readline], + AS_HELP_STRING([--disable-readline], [disable readline support]), [], [enable_readline="yes"]) AC_MSG_RESULT([$enable_readline]) @@ -1850,7 +1850,7 @@ AC_SUBST(LIBREADLINE) AC_MSG_CHECKING([whether to use libpthread for libcfs library]) AC_ARG_ENABLE([libpthread], - AC_HELP_STRING([--disable-libpthread], + AS_HELP_STRING([--disable-libpthread], [disable libpthread]), [], [enable_libpthread="yes"]) AC_MSG_RESULT([$enable_libpthread]) diff --git a/lipe/configure.ac b/lipe/configure.ac index 5841386..302cb29 100644 --- a/lipe/configure.ac +++ b/lipe/configure.ac @@ -19,7 +19,7 @@ AM_PROG_CC_C_O AM_CONDITIONAL(COMPILER_IS_GCC, test "x$GCC" = "xyes") AC_DISABLE_STATIC -AC_PROG_LIBTOOL +LT_INIT AC_PROG_LEX AC_PROG_YACC PKG_PROG_PKG_CONFIG @@ -215,7 +215,7 @@ AM_CONDITIONAL([HAVE_SSH_THREADS], [test x$have_lssh_threads = xyes]) # -------- check whether enable server build -------- AC_MSG_CHECKING([whether enable server]) AC_ARG_ENABLE([server], - AC_HELP_STRING([--disable-server], + AS_HELP_STRING([--disable-server], [disable server]), [enable_server="no"], [enable_server="yes"]) AC_MSG_RESULT([$enable_server]) @@ -228,7 +228,7 @@ AM_COND_IF([BUILD_SERVER], # -------- check whether enable zfs support -------- AC_MSG_CHECKING([whether enable zfs support]) AC_ARG_ENABLE([zfs], - AC_HELP_STRING([--enable-zfs], + AS_HELP_STRING([--enable-zfs], [enable zfs support]), [], [enable_zfs="no"]) AC_MSG_RESULT([$enable_zfs]) diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4 index 854030a..0f34743 100644 --- a/lnet/autoconf/lustre-lnet.m4 +++ b/lnet/autoconf/lustre-lnet.m4 @@ -5,7 +5,7 @@ AC_DEFUN([LN_CONFIG_BACKOFF], [ AC_MSG_CHECKING([whether to enable tunable backoff TCP support]) AC_ARG_ENABLE([backoff], - AC_HELP_STRING([--disable-backoff], + AS_HELP_STRING([--disable-backoff], [disable socknal tunable backoff]), [], [enable_backoff="yes"]) AC_MSG_RESULT([$enable_backoff]) @@ -47,7 +47,7 @@ AC_DEFUN([LN_CONFIG_DLC], [ AC_DEFUN([LN_CONFIG_O2IB_KERNEL], [ AC_MSG_CHECKING([whether to enable kernel ofed]) AC_ARG_ENABLE([o2ib_kernel], - AC_HELP_STRING([--enable-o2ib_kernel=[yes|no]], + AS_HELP_STRING([--enable-o2ib_kernel=[yes|no]], [enable ofed kernel]), [], [enable_o2ib_kernel="no"]) AC_MSG_RESULT([$enable_o2ib_kernel]) @@ -68,7 +68,7 @@ AC_MSG_RESULT([$enable_o2ib_kernel]) AC_DEFUN([LN_CONFIG_O2IB], [ AC_MSG_CHECKING([whether to use Compat RDMA]) AC_ARG_WITH([o2ib], - AC_HELP_STRING([--with-o2ib=[yes|no|]], + AS_HELP_STRING([--with-o2ib=[yes|no|]], [build o2iblnd against path]), [], [with_o2ib="yes"]) @@ -628,7 +628,7 @@ AS_IF([test $ENABLEO2IB != "no"], [ AC_DEFUN([LN_CONFIG_GNILND], [ AC_MSG_CHECKING([whether to enable GNI lnd]) AC_ARG_ENABLE([gni], - AC_HELP_STRING([--enable-gni], + AS_HELP_STRING([--enable-gni], [enable GNI lnd]), [], [enable_gni="no"]) AC_MSG_RESULT([$enable_gni]) @@ -950,7 +950,7 @@ AC_CHECK_FUNCS([strnlen]) AC_MSG_CHECKING([whether to enable 'efence' debugging support]) AC_ARG_ENABLE(efence, - AC_HELP_STRING([--enable-efence], + AS_HELP_STRING([--enable-efence], [use efence library]), [], [enable_efence="no"]) AC_MSG_RESULT([$enable_efence]) diff --git a/lustre.spec.in b/lustre.spec.in index c1c3f80..604c624 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -488,7 +488,7 @@ AC_INIT([o2iblnd-mlnx], [LUSTRE_VERSION.DDN_LUSTRE_VERSION.DDN_BUILD_TAG], AC_CONFIG_AUX_DIR([../../../config]) AC_CONFIG_MACRO_DIR([config]) -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([1.10 tar-ustar -Wno-portability]) AM_MAINTAINER_MODE([enable]) @@ -555,7 +555,7 @@ AC_INIT([o2iblnd-ofed], [LUSTRE_VERSION.DDN_LUSTRE_VERSION.DDN_BUILD_TAG], [http AC_CONFIG_AUX_DIR([../../../config]) AC_CONFIG_MACRO_DIR([config]) -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([1.10 tar-ustar -Wno-portability]) AM_MAINTAINER_MODE([enable]) diff --git a/lustre/autoconf/kerberos5.m4 b/lustre/autoconf/kerberos5.m4 index fa1da10..cb1b33f 100644 --- a/lustre/autoconf/kerberos5.m4 +++ b/lustre/autoconf/kerberos5.m4 @@ -6,7 +6,7 @@ dnl The Kerberos gssapi library will be dynamically loaded? AC_DEFUN([AC_KERBEROS_V5],[ AC_MSG_CHECKING(for Kerberos v5) AC_ARG_WITH(krb5, - [AC_HELP_STRING([--with-krb5=DIR], [use Kerberos v5 installation in DIR])], + [AS_HELP_STRING([--with-krb5=DIR], [use Kerberos v5 installation in DIR])], [ case "$withval" in yes|no) krb5_with="" diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 4821718..b8fb036 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -92,7 +92,7 @@ Lustre requires that Linux is configured with at least a 8KB stack. AC_DEFUN([LC_MDS_MAX_THREADS], [ AC_MSG_CHECKING([for maximum number of MDS threads]) AC_ARG_WITH([mds_max_threads], - AC_HELP_STRING([--with-mds-max-threads=count], + AS_HELP_STRING([--with-mds-max-threads=count], [maximum threads available on the MDS: (default=512)]), [AC_DEFINE_UNQUOTED(MDS_MAX_THREADS, $with_mds_max_threads, [maximum number of MDS threads])]) @@ -107,7 +107,7 @@ AC_MSG_RESULT([$with_mds_max_threads]) AC_DEFUN([LC_CONFIG_PINGER], [ AC_MSG_CHECKING([whether to enable Lustre pinger support]) AC_ARG_ENABLE([pinger], - AC_HELP_STRING([--disable-pinger], + AS_HELP_STRING([--disable-pinger], [disable recovery pinger support]), [], [enable_pinger="yes"]) AC_MSG_RESULT([$enable_pinger]) @@ -123,7 +123,7 @@ AS_IF([test "x$enable_pinger" != xno], AC_DEFUN([LC_CONFIG_CHECKSUM], [ AC_MSG_CHECKING([whether to enable data checksum support]) AC_ARG_ENABLE([checksum], - AC_HELP_STRING([--disable-checksum], + AS_HELP_STRING([--disable-checksum], [disable data checksum support]), [], [enable_checksum="yes"]) AC_MSG_RESULT([$enable_checksum]) @@ -139,7 +139,7 @@ AS_IF([test "x$enable_checksum" != xno], AC_DEFUN([LC_CONFIG_FLOCK], [ AC_MSG_CHECKING([whether to enable flock by default]) AC_ARG_ENABLE([flock], - AC_HELP_STRING([--disable-flock], + AS_HELP_STRING([--disable-flock], [disable flock by default]), [], [enable_flock="yes"]) AC_MSG_RESULT([$enable_flock]) @@ -155,7 +155,7 @@ AS_IF([test "x$enable_flock" != xno], AC_DEFUN([LC_CONFIG_HEALTH_CHECK_WRITE], [ AC_MSG_CHECKING([whether to enable a write with the health check]) AC_ARG_ENABLE([health_write], - AC_HELP_STRING([--enable-health_write], + AS_HELP_STRING([--enable-health_write], [enable disk writes when doing health check]), [], [enable_health_write="no"]) AC_MSG_RESULT([$enable_health_write]) @@ -169,7 +169,7 @@ AS_IF([test "x$enable_health_write" != xno], AC_DEFUN([LC_CONFIG_LRU_RESIZE], [ AC_MSG_CHECKING([whether to enable lru self-adjusting]) AC_ARG_ENABLE([lru_resize], - AC_HELP_STRING([--enable-lru-resize], + AS_HELP_STRING([--enable-lru-resize], [enable lru resize support]), [], [enable_lru_resize="yes"]) AC_MSG_RESULT([$enable_lru_resize]) @@ -227,7 +227,7 @@ LB_CHECK_CONFIG_IM([CRYPTO_MD5], [], AC_DEFUN([LC_CONFIG_GSS_KEYRING], [ AC_MSG_CHECKING([whether to enable gss keyring backend]) AC_ARG_ENABLE([gss_keyring], - [AC_HELP_STRING([--disable-gss-keyring], + [AS_HELP_STRING([--disable-gss-keyring], [disable gss keyring backend])], [], [AS_IF([test "x$enable_gss" != xno], [ enable_gss_keyring="yes"], [ @@ -296,7 +296,7 @@ kernel SUNRPC support is required by using GSS. AC_DEFUN([LC_CONFIG_GSS], [ AC_MSG_CHECKING([whether to enable gss support]) AC_ARG_ENABLE([gss], - [AC_HELP_STRING([--enable-gss], [enable gss support])], + [AS_HELP_STRING([--enable-gss], [enable gss support])], [], [enable_gss="auto"]) AC_MSG_RESULT([$enable_gss]) @@ -2631,7 +2631,7 @@ AC_DEFUN([LC_PROG_LINUX], [ AC_DEFUN([LC_CONFIG_CLIENT], [ AC_MSG_CHECKING([whether to build Lustre client support]) AC_ARG_ENABLE([client], - AC_HELP_STRING([--disable-client], + AS_HELP_STRING([--disable-client], [disable Lustre client support]), [], [enable_client="yes"]) AC_MSG_RESULT([$enable_client]) @@ -2642,7 +2642,7 @@ AC_MSG_RESULT([$enable_client]) # AC_DEFUN([LB_CONFIG_MPITESTS], [ AC_ARG_ENABLE([mpitests], - AC_HELP_STRING([--enable-mpitests=], + AS_HELP_STRING([--enable-mpitests=], [include mpi tests]), [ enable_mpitests="yes" case $enableval in @@ -2693,7 +2693,7 @@ AC_ARG_ENABLE([mpitests], AC_DEFUN([LC_CONFIG_QUOTA], [ AC_MSG_CHECKING([whether to enable quota support global control]) AC_ARG_ENABLE([quota], - AC_HELP_STRING([--enable-quota], + AS_HELP_STRING([--enable-quota], [enable quota support]), [], [enable_quota="yes"]) AS_IF([test "x$enable_quota" = xyes], @@ -2724,7 +2724,7 @@ AS_IF([test "x$enable_quota" != xno -a "x$enable_utils" != xno], [ AC_DEFUN([LC_OSD_ADDON], [ AC_MSG_CHECKING([whether to use OSD addon]) AC_ARG_WITH([osd], - AC_HELP_STRING([--with-osd=path], + AS_HELP_STRING([--with-osd=path], [set path to optional osd]), [ case "$with_osd" in @@ -2766,7 +2766,7 @@ AC_SUBST(OSDADDON) AC_DEFUN([LC_CONFIG_CRYPTO], [ AC_MSG_CHECKING([whether to enable Lustre client crypto]) AC_ARG_ENABLE([crypto], - AC_HELP_STRING([--enable-crypto=yes|no|in-kernel], + AS_HELP_STRING([--enable-crypto=yes|no|in-kernel], [enable Lustre client crypto (default is yes), use 'in-kernel' to force use of in-kernel fscrypt instead of embedded llcrypt]), [], [enable_crypto="auto"]) AS_IF([test "x$enable_crypto" != xno -a "x$enable_dist" = xno], [ @@ -2866,7 +2866,7 @@ AC_CHECK_LIB([keyutils], [add_key]) # Super safe df AC_MSG_CHECKING([whether to report minimum OST free space]) AC_ARG_ENABLE([mindf], - AC_HELP_STRING([--enable-mindf], + AS_HELP_STRING([--enable-mindf], [Make statfs report the minimum available space on any single OST instead of the sum of free space on all OSTs]), [], [enable_mindf="no"]) AC_MSG_RESULT([$enable_mindf]) @@ -2875,7 +2875,7 @@ AS_IF([test "$enable_mindf" = "yes"], AC_MSG_CHECKING([whether to randomly failing memory alloc]) AC_ARG_ENABLE([fail_alloc], - AC_HELP_STRING([--disable-fail-alloc], + AS_HELP_STRING([--disable-fail-alloc], [disable randomly alloc failure]), [], [enable_fail_alloc="yes"]) AC_MSG_RESULT([$enable_fail_alloc]) @@ -2885,7 +2885,7 @@ AS_IF([test "x$enable_fail_alloc" != xno], AC_MSG_CHECKING([whether to check invariants (expensive cpu-wise)]) AC_ARG_ENABLE([invariants], - AC_HELP_STRING([--enable-invariants], + AS_HELP_STRING([--enable-invariants], [enable invariant checking (cpu intensive)]), [], [enable_invariants="no"]) AC_MSG_RESULT([$enable_invariants]) @@ -2895,7 +2895,7 @@ AS_IF([test "x$enable_invariants" = xyes], AC_MSG_CHECKING([whether to track references with lu_ref]) AC_ARG_ENABLE([lu_ref], - AC_HELP_STRING([--enable-lu_ref], + AS_HELP_STRING([--enable-lu_ref], [enable lu_ref reference tracking code]), [], [enable_lu_ref="no"]) AC_MSG_RESULT([$enable_lu_ref]) @@ -2905,7 +2905,7 @@ AS_IF([test "x$enable_lu_ref" = xyes], AC_MSG_CHECKING([whether to enable page state tracking]) AC_ARG_ENABLE([pgstate-track], - AC_HELP_STRING([--enable-pgstate-track], + AS_HELP_STRING([--enable-pgstate-track], [enable page state tracking]), [], [enable_pgstat_track="no"]) AC_MSG_RESULT([$enable_pgstat_track]) diff --git a/snmp/autoconf/lustre-snmp.m4 b/snmp/autoconf/lustre-snmp.m4 index 2eef4a0..8d6bb7e 100644 --- a/snmp/autoconf/lustre-snmp.m4 +++ b/snmp/autoconf/lustre-snmp.m4 @@ -6,7 +6,7 @@ AC_DEFUN([LS_CONFIGURE], [ AC_MSG_CHECKING([whether to try to build SNMP support]) AC_ARG_ENABLE([snmp], - AC_HELP_STRING([--enable-snmp], + AS_HELP_STRING([--enable-snmp], [require SNMP support (default=auto)]), [], [enable_snmp="auto"]) AC_MSG_RESULT([$enable_snmp]) -- 1.8.3.1