Skip to content

Commit 4dbcff8

Browse files
committed
configury: change all AC_HELP_STRING --> AS_HELP_STRING
Mixing AC_HELP_STRING and AS_HELP_STRING in the same .m4 file resulted in warnings from Autoconf >= v2.70. Signed-off-by: Jeff Squyres <[email protected]>
1 parent 96930dd commit 4dbcff8

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

config/extract-3rd-party-configure.pl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/env perl
22
#
33
# Copyright (c) 2021 IBM Corporation. All rights reserved.
4+
# Copyright (c) 2021 Cisco Systems. All rights reserved.
45
#
56
# $COPYRIGHT$
67
#
@@ -216,7 +217,7 @@ ($)
216217
# Argument separator
217218
# We only care about counting arguments for the outermost
218219
# function (e.g., AC_ARG_ENABLE), not the innermost
219-
# function (e.g., AC_HELP_STRING) - which we take all of.
220+
# function (e.g., AS_HELP_STRING) - which we take all of.
220221
# We know we are in the outermost because the '(' will be
221222
# only thing on the stack.
222223
elsif( scalar(@the_stack) == 1 && $char eq "," ) {

config/ompi_check_psm2.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# Copyright (c) 2004-2006 The Regents of the University of California.
1212
# All rights reserved.
1313
# Copyright (c) 2006 QLogic Corp. All rights reserved.
14-
# Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved.
14+
# Copyright (c) 2009-2021 Cisco Systems, Inc. All rights reserved.
1515
# Copyright (c) 2016 Intel Corporation. All rights reserved.
1616
# Copyright (c) 2015 Research Organization for Information Science
1717
# and Technology (RIST). All rights reserved.
@@ -44,7 +44,7 @@ AC_DEFUN([OMPI_CHECK_PSM2],[
4444
OPAL_CHECK_WITHDIR([psm2-libdir], [$with_psm2_libdir], [libpsm2.*])
4545

4646
AC_ARG_ENABLE([psm2-version-check],
47-
[AC_HELP_STRING([--disable-psm2-version-check],
47+
[AS_HELP_STRING([--disable-psm2-version-check],
4848
[Disable PSM2 version checking. Not recommended to disable. (default: enabled)])])
4949

5050
ompi_check_psm2_$1_save_CPPFLAGS="$CPPFLAGS"

config/ompi_check_ucc.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dnl -*- shell-script -*-
22
dnl
33
dnl Copyright (c) 2021 Mellanox Technologies. All rights reserved.
4-
dnl Copyright (c) 2013 Cisco Systems, Inc. All rights reserved.
4+
dnl Copyright (c) 2013-2021 Cisco Systems, Inc. All rights reserved.
55
dnl Copyright (c) 2015 Research Organization for Information Science
66
dnl and Technology (RIST). All rights reserved.
77
dnl $COPYRIGHT$
@@ -20,7 +20,7 @@ AC_DEFUN([OMPI_CHECK_UCC],[
2020
OPAL_VAR_SCOPE_PUSH([ompi_check_ucc_dir ompi_check_ucc_libs ompi_check_ucc_happy CPPFLAGS_save LDFLAGS_save LIBS_save])
2121

2222
AC_ARG_WITH([ucc],
23-
[AC_HELP_STRING([--with-ucc(=DIR)],
23+
[AS_HELP_STRING([--with-ucc(=DIR)],
2424
[Build UCC (Unified Collective Communication)])])
2525

2626
AS_IF([test "$with_ucc" != "no"],

0 commit comments

Comments
 (0)