Skip to content

Commit b84c60e

Browse files
cniethammercniethammer
committed
Add propper quoting for AC_ARG_ENABLE and AC_ARG_WITH macros where missing
Signed-off-by: Christoph Niethammer <[email protected]>
1 parent 8f0f87c commit b84c60e

21 files changed

+112
-112
lines changed

‎config/ompi_configure_options.m4

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ AC_ARG_ENABLE([mpi],
4646
#
4747

4848
AC_MSG_CHECKING([if want compile-time warnings inside of mpi.h])
49-
AC_ARG_ENABLE(mpi-interface-warning,
50-
AS_HELP_STRING([--enable-mpi-interface-warning],
51-
[enable compile-time warnings when deprecated MPI functions are used (default: enabled)]))
49+
AC_ARG_ENABLE([mpi-interface-warning],
50+
[AS_HELP_STRING([--enable-mpi-interface-warning],
51+
[enable compile-time warnings when deprecated MPI functions are used (default: enabled)])])
5252
if test "$enable_mpi_interface_warning" != "no"; then
5353
AC_MSG_RESULT([yes])
5454
OMPI_WANT_MPI_INTERFACE_WARNING=1
@@ -64,9 +64,9 @@ AC_DEFINE_UNQUOTED([OMPI_WANT_MPI_INTERFACE_WARNING], [$OMPI_WANT_MPI_INTERFACE_
6464
#
6565

6666
AC_MSG_CHECKING([if want sparse process groups])
67-
AC_ARG_ENABLE(sparse-groups,
68-
AS_HELP_STRING([--enable-sparse-groups],
69-
[enable sparse process groups (default: not enabled)]))
67+
AC_ARG_ENABLE([sparse-groups],
68+
[AS_HELP_STRING([--enable-sparse-groups],
69+
[enable sparse process groups (default: not enabled)])])
7070
if test "$enable_sparse_groups" = "yes"; then
7171
AC_MSG_RESULT([yes])
7272
GROUP_SPARSE=1
@@ -83,9 +83,9 @@ AC_DEFINE_UNQUOTED([OMPI_GROUP_SPARSE],$GROUP_SPARSE,
8383
#
8484

8585
AC_MSG_CHECKING([if want peruse support])
86-
AC_ARG_ENABLE(peruse,
87-
AS_HELP_STRING([--enable-peruse],
88-
[enable PERUSE interface (default: disabled)]))
86+
AC_ARG_ENABLE([peruse],
87+
[AS_HELP_STRING([--enable-peruse],
88+
[enable PERUSE interface (default: disabled)])])
8989
if test "$enable_peruse" = "yes"; then
9090
AC_MSG_RESULT([yes])
9191
WANT_PERUSE=1
@@ -102,9 +102,9 @@ AM_CONDITIONAL(WANT_PERUSE, test "$WANT_PERUSE" = "1")
102102
# Fortran MPI bindings
103103
#
104104
AC_MSG_CHECKING([if want Fortran MPI bindings])
105-
AC_ARG_ENABLE(mpi-fortran,
106-
AS_HELP_STRING([--enable-mpi-fortran],
107-
[specify which Fortran MPI bindings to build: yes, none (or no), best-effort, mpifh (build only mpif.h support), usempi (build mpif.h and the mpi module), or usempif08 (or all, build mpifh, the mpi module, and the mpi_f08 module) (default: "yes" if Fortran compiler found)]))
105+
AC_ARG_ENABLE([mpi-fortran],
106+
[AS_HELP_STRING([--enable-mpi-fortran],
107+
[specify which Fortran MPI bindings to build: yes, none (or no), best-effort, mpifh (build only mpif.h support), usempi (build mpif.h and the mpi module), or usempif08 (or all, build mpifh, the mpi module, and the mpi_f08 module) (default: "yes" if Fortran compiler found)])])
108108

109109
# These are the 4 monotonically-rising values indicating levels of
110110
# Fortran bindings support.
@@ -202,9 +202,9 @@ AM_CONDITIONAL([OMPI_ENABLE_GREQUEST_EXTENSIONS],[test $ompi_grequest_extensions
202202
#
203203

204204
AC_MSG_CHECKING([if want run-time MPI parameter checking])
205-
AC_ARG_WITH(mpi-param-check,
206-
AS_HELP_STRING([--with-mpi-param-check(=VALUE)],
207-
[behavior of MPI function parameter checking. Valid values are: always, never, runtime. If --with-mpi-param-check is specified with no VALUE argument, it is equivalent to a VALUE of "always"; --without-mpi-param-check is equivalent to "never" (default: runtime).]))
205+
AC_ARG_WITH([mpi-param-check],
206+
[AS_HELP_STRING([--with-mpi-param-check(=VALUE)],
207+
[behavior of MPI function parameter checking. Valid values are: always, never, runtime. If --with-mpi-param-check is specified with no VALUE argument, it is equivalent to a VALUE of "always"; --without-mpi-param-check is equivalent to "never" (default: runtime).])])
208208
mpi_param_check=ompi_mpi_param_check
209209
if test "$with_mpi_param_check" = "no" || \
210210
test "$with_mpi_param_check" = "never"; then

‎config/ompi_contrib.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ AC_DEFUN([OMPI_CONTRIB],[
3939

4040
# Option to not build some of the contributed software packages
4141
AC_ARG_ENABLE([contrib-no-build],
42-
AS_HELP_STRING([--enable-contrib-no-build=LIST],
43-
[Comma-separated list of contributed package names that will not be built. Possible values: ompi_mpicontrib_list. Example: "--enable-contrib-no-build=foo,bar" will disable building both the "foo" and "bar" contributed software packages (default: none -- i.e., build all possible contrib packages)]))
42+
[AS_HELP_STRING([--enable-contrib-no-build=LIST],
43+
[Comma-separated list of contributed package names that will not be built. Possible values: ompi_mpicontrib_list. Example: "--enable-contrib-no-build=foo,bar" will disable building both the "foo" and "bar" contributed software packages (default: none -- i.e., build all possible contrib packages)])])
4444

4545
# Parse the list to see what we should not build
4646
opal_show_subtitle "Configuring contributed software packages"

‎config/ompi_ext.m4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ AC_DEFUN([OMPI_EXT],[
4040
# [default -- no option given] = No extensions built
4141
# --enable-mpi-ext=[,]*EXTENSION[,]*
4242
#
43-
AC_ARG_ENABLE(mpi-ext,
44-
AS_HELP_STRING([--enable-mpi-ext[=LIST]],
45-
[Comma-separated list of extensions that should be built. Possible values: ompi_mpiext_list. Example: "--enable-mpi-ext=foo,bar" will enable building the MPI extensions "foo" and "bar". If LIST is empty or the special value "all", then all available MPI extensions will be built (default: all).]))
43+
AC_ARG_ENABLE([mpi-ext],
44+
[AS_HELP_STRING([--enable-mpi-ext[=LIST]],
45+
[Comma-separated list of extensions that should be built. Possible values: ompi_mpiext_list. Example: "--enable-mpi-ext=foo,bar" will enable building the MPI extensions "foo" and "bar". If LIST is empty or the special value "all", then all available MPI extensions will be built (default: all).])])
4646

4747
# print some nice messages about what we're about to do...
4848
AC_MSG_CHECKING([for available MPI Extensions])

‎config/ompi_setup_java.m4

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -229,15 +229,15 @@ AC_DEFUN([OMPI_SETUP_JAVA],[
229229
ompi_java_happy=no
230230
ompi_javah_happy=no
231231

232-
AC_ARG_WITH(jdk-dir,
233-
AS_HELP_STRING([--with-jdk-dir(=DIR)],
234-
[Location of the JDK header directory. If you use this option, do not specify --with-jdk-bindir or --with-jdk-headers.]))
235-
AC_ARG_WITH(jdk-bindir,
236-
AS_HELP_STRING([--with-jdk-bindir(=DIR)],
237-
[Location of the JDK bin directory. If you use this option, you must also use --with-jdk-headers (and you must NOT use --with-jdk-dir)]))
238-
AC_ARG_WITH(jdk-headers,
239-
AS_HELP_STRING([--with-jdk-headers(=DIR)],
240-
[Location of the JDK header directory. If you use this option, you must also use --with-jdk-bindir (and you must NOT use --with-jdk-dir)]))
232+
AC_ARG_WITH([jdk-dir],
233+
[AS_HELP_STRING([--with-jdk-dir(=DIR)],
234+
[Location of the JDK header directory. If you use this option, do not specify --with-jdk-bindir or --with-jdk-headers.])])
235+
AC_ARG_WITH([jdk-bindir],
236+
[AS_HELP_STRING([--with-jdk-bindir(=DIR)],
237+
[Location of the JDK bin directory. If you use this option, you must also use --with-jdk-headers (and you must NOT use --with-jdk-dir)])])
238+
AC_ARG_WITH([jdk-headers],
239+
[AS_HELP_STRING([--with-jdk-headers(=DIR)],
240+
[Location of the JDK header directory. If you use this option, you must also use --with-jdk-bindir (and you must NOT use --with-jdk-dir)])])
241241

242242
# Only setup the compiler if we were requested to
243243
AS_IF([test "$1" = "yes"],

‎config/ompi_setup_mpi_java.m4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ dnl Do everything required to setup the Java MPI bindings.
2929
AC_DEFUN([OMPI_SETUP_JAVA_BINDINGS],[
3030
opal_show_subtitle "Java MPI bindings"
3131

32-
AC_ARG_ENABLE(mpi-java,
33-
AS_HELP_STRING([--enable-mpi-java],
34-
[enable Java MPI bindings (default: disabled)]))
32+
AC_ARG_ENABLE([mpi-java],
33+
[AS_HELP_STRING([--enable-mpi-java],
34+
[enable Java MPI bindings (default: disabled)])])
3535

3636
# Find the Java compiler and whatnot.
3737
# It knows to do very little if $enable_mpi_java!="yes".

‎config/opal_case_sensitive_fs_setup.m4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ rm -f conf_fs_test.$$ CONF_FS_TEST.$$
5959
# Now see what the user wants to do...
6060
#
6161
AC_MSG_CHECKING([if configuring for case sensitive filesystem])
62-
AC_ARG_WITH(cs_fs,
63-
AS_HELP_STRING([--with-cs-fs],
64-
[Destination FS is case sensitive (default: set to value of the build FS's case sensitivity)]))
62+
AC_ARG_WITH([cs_fs],
63+
[AS_HELP_STRING([--with-cs-fs],
64+
[Destination FS is case sensitive (default: set to value of the build FS's case sensitivity)])])
6565
6666
if test "$with_cs_fs" = "yes"; then
6767
OPAL_WANT_CS_FS=1

‎config/opal_check_alt_short_float.m4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ dnl ------------------------------------------------------------
1616
AC_DEFUN([OPAL_CHECK_ALT_SHORT_FLOAT], [
1717
AC_CHECK_TYPES(_Float16)
1818
AC_MSG_CHECKING([if want alternate C type of short float])
19-
AC_ARG_ENABLE(alt-short-float,
20-
AS_HELP_STRING([--enable-alt-short-float=TYPE],
21-
[Use an alternate C type TYPE of 'short float' if 'short float' is not available on the C compiler. 'short float' is a new C type proposed for the next C language standard in ISO/IEC JTC 1/SC 22 WG 14 (C WG). (default: "_Float16" if available, disabled otherwise)]))
19+
AC_ARG_ENABLE([alt-short-float],
20+
[AS_HELP_STRING([--enable-alt-short-float=TYPE],
21+
[Use an alternate C type TYPE of 'short float' if 'short float' is not available on the C compiler. 'short float' is a new C type proposed for the next C language standard in ISO/IEC JTC 1/SC 22 WG 14 (C WG). (default: "_Float16" if available, disabled otherwise)])])
2222
if test "$enable_alt_short_float" = "yes"; then
2323
AC_MSG_ERROR([--enable-alt-short-float must have an argument.])
2424
elif test "$enable_alt_short_float" = "no"; then

‎config/opal_check_visibility.m4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ AC_DEFUN([OPAL_CHECK_VISIBILITY],[
2626

2727
# Check if the compiler has support for visibility, like some
2828
# versions of gcc, icc Sun Studio cc.
29-
AC_ARG_ENABLE(visibility,
30-
AS_HELP_STRING([--enable-visibility],
31-
[enable visibility feature of certain compilers/linkers (default: enabled)]))
29+
AC_ARG_ENABLE([visibility],
30+
[AS_HELP_STRING([--enable-visibility],
31+
[enable visibility feature of certain compilers/linkers (default: enabled)])])
3232

3333
opal_visibility_define=0
3434
opal_msg="whether to enable symbol visibility"

‎config/opal_configure_options.m4

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ fi
4848
#
4949

5050
AC_MSG_CHECKING([if want to run code coverage])
51-
AC_ARG_ENABLE(coverage,
52-
AS_HELP_STRING([--enable-coverage],
53-
[enable code coverage files to be generated]))
51+
AC_ARG_ENABLE([coverage],
52+
[AS_HELP_STRING([--enable-coverage],
53+
[enable code coverage files to be generated])])
5454
if test "$enable_coverage" = "yes"; then
5555
if test "$enable_shared" = "yes"; then
5656
AC_MSG_WARN([Code coverage can run only with static libraries. Please
@@ -73,9 +73,9 @@ fi
7373
#
7474

7575
AC_MSG_CHECKING([if want to compile with branch probabilities])
76-
AC_ARG_ENABLE(branch-probabilities,
77-
AS_HELP_STRING([--enable-branch-probabilities],
78-
[enable profile arcs and branch probability optimization]))
76+
AC_ARG_ENABLE([branch-probabilities],
77+
[AS_HELP_STRING([--enable-branch-probabilities],
78+
[enable profile arcs and branch probability optimization])])
7979
if test "$enable_branch_probabilities" = "yes"; then
8080
AC_MSG_RESULT([yes])
8181
WANT_BRANCH_PROBABILITIES=1
@@ -90,9 +90,9 @@ fi
9090
#
9191

9292
AC_MSG_CHECKING([if want to debug memory usage])
93-
AC_ARG_ENABLE(mem-debug,
94-
AS_HELP_STRING([--enable-mem-debug],
95-
[enable memory debugging (not for general MPI users!) (default: disabled)]))
93+
AC_ARG_ENABLE([mem-debug],
94+
[AS_HELP_STRING([--enable-mem-debug],
95+
[enable memory debugging (not for general MPI users!) (default: disabled)])])
9696
if test "$enable_mem_debug" = "yes"; then
9797
AC_MSG_RESULT([yes])
9898
WANT_MEM_DEBUG=1
@@ -108,9 +108,9 @@ AC_DEFINE_UNQUOTED(OPAL_ENABLE_MEM_DEBUG, $WANT_MEM_DEBUG,
108108
#
109109

110110
AC_MSG_CHECKING([if want to profile memory usage])
111-
AC_ARG_ENABLE(mem-profile,
112-
AS_HELP_STRING([--enable-mem-profile],
113-
[enable memory profiling (not for general MPI users!) (default: disabled)]))
111+
AC_ARG_ENABLE([mem-profile],
112+
[AS_HELP_STRING([--enable-mem-profile],
113+
[enable memory profiling (not for general MPI users!) (default: disabled)])])
114114
if test "$enable_mem_profile" = "yes"; then
115115
AC_MSG_RESULT([yes])
116116
WANT_MEM_PROFILE=1
@@ -126,9 +126,9 @@ AC_DEFINE_UNQUOTED(OPAL_ENABLE_MEM_PROFILE, $WANT_MEM_PROFILE,
126126
#
127127

128128
AC_MSG_CHECKING([if want developer-level compiler pickyness])
129-
AC_ARG_ENABLE(picky,
130-
AS_HELP_STRING([--enable-picky],
131-
[enable developer-level compiler pickyness when building Open MPI (default: disabled, unless a .git directory is found in the build tree)]))
129+
AC_ARG_ENABLE([picky],
130+
[AS_HELP_STRING([--enable-picky],
131+
[enable developer-level compiler pickyness when building Open MPI (default: disabled, unless a .git directory is found in the build tree)])])
132132
if test "$enable_picky" = "yes"; then
133133
AC_MSG_RESULT([yes])
134134
WANT_PICKY_COMPILER=1
@@ -148,9 +148,9 @@ fi
148148
#
149149

150150
AC_MSG_CHECKING([if want developer-level debugging code])
151-
AC_ARG_ENABLE(debug,
152-
AS_HELP_STRING([--enable-debug],
153-
[enable developer-level debugging code (not for general MPI users!) (default: disabled)]))
151+
AC_ARG_ENABLE([debug],
152+
[AS_HELP_STRING([--enable-debug],
153+
[enable developer-level debugging code (not for general MPI users!) (default: disabled)])])
154154
if test "$enable_debug" = "yes"; then
155155
AC_MSG_RESULT([yes])
156156
WANT_DEBUG=1
@@ -161,9 +161,9 @@ fi
161161

162162

163163
AC_MSG_CHECKING([if want to developer-level timing framework])
164-
AC_ARG_ENABLE(timing,
165-
AS_HELP_STRING([--enable-timing],
166-
[enable developer-level timing code (not for general MPI users!) (default: disabled)]))
164+
AC_ARG_ENABLE([timing],
165+
[AS_HELP_STRING([--enable-timing],
166+
[enable developer-level timing code (not for general MPI users!) (default: disabled)])])
167167
if test "$enable_timing" = "yes"; then
168168
AC_MSG_RESULT([yes])
169169
WANT_TIMING=1
@@ -185,18 +185,18 @@ fi
185185
AC_DEFINE_UNQUOTED(OPAL_ENABLE_DEBUG, $WANT_DEBUG,
186186
[Whether we want developer-level debugging code or not])
187187

188-
AC_ARG_ENABLE(debug-symbols,
189-
AS_HELP_STRING([--disable-debug-symbols],
190-
[Disable adding compiler flags to enable debugging symbols if --enable-debug is specified. For non-debugging builds, this flag has no effect.]))
188+
AC_ARG_ENABLE([debug-symbols],
189+
[AS_HELP_STRING([--disable-debug-symbols],
190+
[Disable adding compiler flags to enable debugging symbols if --enable-debug is specified. For non-debugging builds, this flag has no effect.])])
191191

192192
#
193193
# Do we want to install all of OPAL/ORTE and OMPI's header files?
194194
#
195195

196196
AC_MSG_CHECKING([if want to install project-internal header files])
197-
AC_ARG_WITH(devel-headers,
198-
AS_HELP_STRING([--with-devel-headers],
199-
[normal MPI users/applications do not need this (mpi.h and mpif.h are ALWAYS installed). Developer headers are only necessary for MCA module authors (default: disabled).]))
197+
AC_ARG_WITH([devel-headers],
198+
[AS_HELP_STRING([--with-devel-headers],
199+
[normal MPI users/applications do not need this (mpi.h and mpif.h are ALWAYS installed). Developer headers are only necessary for MCA module authors (default: disabled).])])
200200
if test "$with_devel_headers" = "yes"; then
201201
AC_MSG_RESULT([yes])
202202
WANT_INSTALL_HEADERS=1
@@ -232,9 +232,9 @@ AC_DEFINE_UNQUOTED([OPAL_WANT_PRETTY_PRINT_STACKTRACE],
232232
#
233233

234234
AC_MSG_CHECKING([if want pty support])
235-
AC_ARG_ENABLE(pty-support,
236-
AS_HELP_STRING([--enable-pty-support],
237-
[Enable/disable PTY support for STDIO forwarding. (default: enabled)]))
235+
AC_ARG_ENABLE([pty-support],
236+
[AS_HELP_STRING([--enable-pty-support],
237+
[Enable/disable PTY support for STDIO forwarding. (default: enabled)])])
238238
if test "$enable_pty_support" = "no" ; then
239239
AC_MSG_RESULT([no])
240240
OPAL_ENABLE_PTY_SUPPORT=0
@@ -251,9 +251,9 @@ AC_DEFINE_UNQUOTED([OPAL_ENABLE_PTY_SUPPORT], [$OPAL_ENABLE_PTY_SUPPORT],
251251
#
252252

253253
AC_MSG_CHECKING([if want weak symbol support])
254-
AC_ARG_ENABLE(weak-symbols,
255-
AS_HELP_STRING([--enable-weak-symbols],
256-
[use weak symbols, if available (default: enabled)]))
254+
AC_ARG_ENABLE([weak-symbols],
255+
[AS_HELP_STRING([--enable-weak-symbols],
256+
[use weak symbols, if available (default: enabled)])])
257257
if test "$enable_weak_symbols" != "no"; then
258258
AC_MSG_RESULT([yes])
259259
WANT_WEAK_SYMBOLS=1

‎config/opal_functions.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -576,8 +576,8 @@ AC_DEFUN([OPAL_WITH_OPTION_MIN_MAX_VALUE], [
576576
max_value=[$2]
577577
AC_MSG_CHECKING([maximum length of ]m4_translit($1, [_], [ ]))
578578
AC_ARG_WITH([max-]m4_translit($1, [_], [-]),
579-
AS_HELP_STRING([--with-max-]m4_translit($1, [_], [-])[=VALUE],
580-
[maximum length of ]m4_translit($1, [_], [ ])[s. VALUE argument has to be specified (default: [$2]).]))
579+
[AS_HELP_STRING([--with-max-]m4_translit($1, [_], [-])[=VALUE],
580+
[maximum length of ]m4_translit($1, [_], [ ])[s. VALUE argument has to be specified (default: [$2]).])])
581581
if test ! -z "$with_max_[$1]" && test "$with_max_[$1]" != "no" ; then
582582
# Ensure it's a number (hopefully an integer!), and >0
583583
expr $with_max_[$1] + 1 > /dev/null 2> /dev/null

0 commit comments

Comments
 (0)