Skip to content

Commit d521852

Browse files
bwbarrettbwbarrett
committed
build: Detabify Autoconf macro files
Many of our macros were full of unnecessary tabs. Convert them to spaces. Signed-off-by: Brian Barrett <[email protected]>
1 parent 4265e24 commit d521852

28 files changed

+294
-294
lines changed

‎config/ompi_check_psm2.m4

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -34,45 +34,45 @@
3434
# support, otherwise executes action-if-not-found
3535
AC_DEFUN([OMPI_CHECK_PSM2],[
3636
if test -z "$ompi_check_psm2_happy" ; then
37-
AC_ARG_WITH([psm2],
38-
[AS_HELP_STRING([--with-psm2(=DIR)],
39-
[Build PSM2 (Intel PSM2) support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
40-
OPAL_CHECK_WITHDIR([psm2], [$with_psm2], [include/psm2.h])
41-
AC_ARG_WITH([psm2-libdir],
42-
[AS_HELP_STRING([--with-psm2-libdir=DIR],
43-
[Search for PSM (Intel PSM2) libraries in DIR])])
44-
OPAL_CHECK_WITHDIR([psm2-libdir], [$with_psm2_libdir], [libpsm2.*])
37+
AC_ARG_WITH([psm2],
38+
[AS_HELP_STRING([--with-psm2(=DIR)],
39+
[Build PSM2 (Intel PSM2) support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
40+
OPAL_CHECK_WITHDIR([psm2], [$with_psm2], [include/psm2.h])
41+
AC_ARG_WITH([psm2-libdir],
42+
[AS_HELP_STRING([--with-psm2-libdir=DIR],
43+
[Search for PSM (Intel PSM2) libraries in DIR])])
44+
OPAL_CHECK_WITHDIR([psm2-libdir], [$with_psm2_libdir], [libpsm2.*])
4545

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

50-
ompi_check_psm2_$1_save_CPPFLAGS="$CPPFLAGS"
51-
ompi_check_psm2_$1_save_LDFLAGS="$LDFLAGS"
52-
ompi_check_psm2_$1_save_LIBS="$LIBS"
50+
ompi_check_psm2_$1_save_CPPFLAGS="$CPPFLAGS"
51+
ompi_check_psm2_$1_save_LDFLAGS="$LDFLAGS"
52+
ompi_check_psm2_$1_save_LIBS="$LIBS"
5353

54-
AS_IF([test "$with_psm2" != "no"],
54+
AS_IF([test "$with_psm2" != "no"],
5555
[AS_IF([test ! -z "$with_psm2" && test "$with_psm2" != "yes"],
5656
[ompi_check_psm2_dir="$with_psm2"])
5757
AS_IF([test ! -z "$with_psm2_libdir" && test "$with_psm2_libdir" != "yes"],
5858
[ompi_check_psm2_libdir="$with_psm2_libdir"])
5959

6060
OPAL_CHECK_PACKAGE([ompi_check_psm2],
61-
[psm2.h],
62-
[psm2],
63-
[psm2_mq_irecv2],
64-
[],
65-
[$ompi_check_psm2_dir],
66-
[$ompi_check_psm2_libdir],
67-
[ompi_check_psm2_happy="yes"],
68-
[ompi_check_psm2_happy="no"])],
61+
[psm2.h],
62+
[psm2],
63+
[psm2_mq_irecv2],
64+
[],
65+
[$ompi_check_psm2_dir],
66+
[$ompi_check_psm2_libdir],
67+
[ompi_check_psm2_happy="yes"],
68+
[ompi_check_psm2_happy="no"])],
6969
[ompi_check_psm2_happy="no"])
7070

71-
AS_IF([test "$ompi_check_psm2_happy" = "yes" && test "$enable_progress_threads" = "yes"],
71+
AS_IF([test "$ompi_check_psm2_happy" = "yes" && test "$enable_progress_threads" = "yes"],
7272
[AC_MSG_WARN([PSM2 driver does not currently support progress threads. Disabling MTL.])
7373
ompi_check_psm2_happy="no"])
7474

75-
AS_IF([test "$ompi_check_psm2_happy" = "yes"],
75+
AS_IF([test "$ompi_check_psm2_happy" = "yes"],
7676
[AC_CHECK_HEADERS(
7777
glob.h,
7878
[],
@@ -92,18 +92,18 @@ AC_DEFUN([OMPI_CHECK_PSM2],[
9292
[#include <psm2.h>])]
9393
)
9494

95-
CPPFLAGS="$ompi_check_psm2_$1_save_CPPFLAGS"
96-
LDFLAGS="$ompi_check_psm2_$1_save_LDFLAGS"
97-
LIBS="$ompi_check_psm2_$1_save_LIBS"
95+
CPPFLAGS="$ompi_check_psm2_$1_save_CPPFLAGS"
96+
LDFLAGS="$ompi_check_psm2_$1_save_LDFLAGS"
97+
LIBS="$ompi_check_psm2_$1_save_LIBS"
9898

9999
OPAL_SUMMARY_ADD([Transports], [Intel Omnipath (PSM2)], [], [$ompi_check_psm2_happy])
100100
fi
101101

102102
AS_IF([test "$ompi_check_psm2_happy" = "yes"],
103103
[$1_LDFLAGS="[$]$1_LDFLAGS $ompi_check_psm2_LDFLAGS"
104-
$1_CPPFLAGS="[$]$1_CPPFLAGS $ompi_check_psm2_CPPFLAGS"
105-
$1_LIBS="[$]$1_LIBS $ompi_check_psm2_LIBS"
106-
$2],
104+
$1_CPPFLAGS="[$]$1_CPPFLAGS $ompi_check_psm2_CPPFLAGS"
105+
$1_LIBS="[$]$1_LIBS $ompi_check_psm2_LIBS"
106+
$2],
107107
[AS_IF([test ! -z "$with_psm2" && test "$with_psm2" != "no"],
108108
[AC_MSG_ERROR([PSM2 support requested but not found. Aborting])])
109109
$3])

‎config/ompi_check_ucx.m4

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ AC_DEFUN([OMPI_CHECK_UCX],[
2525

2626
AS_IF([test -z "$ompi_check_ucx_happy"],
2727
[AC_ARG_WITH([ucx],
28-
[AS_HELP_STRING([--with-ucx(=DIR)],
29-
[Build with Unified Communication X library support])])
30-
OPAL_CHECK_WITHDIR([ucx], [$with_ucx], [include/ucp/api/ucp.h])
31-
AC_ARG_WITH([ucx-libdir],
32-
[AS_HELP_STRING([--with-ucx-libdir=DIR],
33-
[Search for Unified Communication X libraries in DIR])])
34-
OPAL_CHECK_WITHDIR([ucx-libdir], [$with_ucx_libdir], [libucp.*])
28+
[AS_HELP_STRING([--with-ucx(=DIR)],
29+
[Build with Unified Communication X library support])])
30+
OPAL_CHECK_WITHDIR([ucx], [$with_ucx], [include/ucp/api/ucp.h])
31+
AC_ARG_WITH([ucx-libdir],
32+
[AS_HELP_STRING([--with-ucx-libdir=DIR],
33+
[Search for Unified Communication X libraries in DIR])])
34+
OPAL_CHECK_WITHDIR([ucx-libdir], [$with_ucx_libdir], [libucp.*])
3535

36-
AS_IF([test "$with_ucx" != "no"],
36+
AS_IF([test "$with_ucx" != "no"],
3737
[AS_IF([test -n "$with_ucx" && test "$with_ucx" != "yes"],
3838
[ompi_check_ucx_dir="$with_ucx"],
3939
[PKG_CHECK_MODULES_STATIC([ucx],[ucx],

‎config/ompi_fortran_check.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ AC_DEFUN([OMPI_FORTRAN_CHECK], [
117117

118118
AC_MSG_CHECKING([for corresponding KIND value of $1])
119119
case "$ofc_c_type" in
120-
char) ofc_type_kind=C_SIGNED_CHAR ;;
120+
char) ofc_type_kind=C_SIGNED_CHAR ;;
121121
double) ofc_type_kind=C_DOUBLE ;;
122122
float) ofc_type_kind=C_FLOAT ;;
123123
int) ofc_type_kind=C_INT ;;

‎config/ompi_fortran_get_value_true.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void ompi_print_f(ompi_fortran_logical_t * logical)
6767
if( SIZEOF_INT >= sizeof(ompi_fortran_logical_t) ) {
6868
fprintf(f, "%d\n", (int)*logical);
6969
} else if (SIZEOF_LONG >= sizeof(ompi_fortran_logical_t) ) {
70-
fprintf(f, "%ld\n", (long) *logical);
70+
fprintf(f, "%ld\n", (long) *logical);
7171
} else if (SIZEOF_LONG_LONG >= sizeof(ompi_fortran_logical_t) ) {
7272
fprintf(f, "%lld\n", (long long) *logical);
7373
} else {

‎config/ompi_setup_prrte.m4

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ AC_DEFUN([OMPI_SETUP_PRRTE],[
4949
[OMPI_PRRTE_ADD_ARGS
5050
AS_IF([test "$opal_prrte_mode" = "unspecified" -o "$opal_prrte_mode" = "internal"],
5151
[# Run PRRTE's configure script unless the user
52-
# explicitly asked us to use an external PMIX, so that
53-
# "make dist" includes PRRTE in the dist tarball. This
54-
# does mean that "make dist" will not work if Open MPI
55-
# was configured to use an external PRRTE library, but
56-
# we decided this was a reasonable tradeoff for not
57-
# having to deal with PRRTE (or PMIx) potentially
58-
# failing to configure in a situation where it isn't
59-
# desired.
52+
# explicitly asked us to use an external PMIX, so that
53+
# "make dist" includes PRRTE in the dist tarball. This
54+
# does mean that "make dist" will not work if Open MPI
55+
# was configured to use an external PRRTE library, but
56+
# we decided this was a reasonable tradeoff for not
57+
# having to deal with PRRTE (or PMIx) potentially
58+
# failing to configure in a situation where it isn't
59+
# desired.
6060
_OMPI_SETUP_PRRTE_INTERNAL([prrte_setup_internal_happy=1],
6161
[prrte_setup_internal_happy=0])])
6262
@@ -282,7 +282,7 @@ AC_DEFUN([_OMPI_SETUP_PRRTE_EXTERNAL], [
282282
AS_IF([test ! -r ${PRTE_PATH}],
283283
[AC_MSG_ERROR([Could not find prte binary at $PRTE_PATH])],
284284
[PRTE_PATH="${with_prrte}/bin"])],
285-
[PRTE_PATH=""
285+
[PRTE_PATH=""
286286
OPAL_WHICH([prte], [PRTE_PATH])
287287
AS_IF([tets -z "$PRTE_PATH"],
288288
[AC_MSG_WARN([Could not find prte in PATH])

‎config/opal_check_cma.m4

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,17 +115,17 @@ static void do_check (pid_t pid, int *in, int *out)
115115
/* all good */
116116
return 0;
117117
]])],
118-
[AC_MSG_RESULT([yes])
119-
opal_check_cma_happy=1],
120-
[AC_MSG_RESULT([no])
121-
opal_check_cma_happy=0],
122-
[AC_MSG_RESULT([no (cross-compiling)])
123-
opal_check_cma_happy=0])
124-
CFLAGS=$opal_check_cma_CFLAGS
118+
[AC_MSG_RESULT([yes])
119+
opal_check_cma_happy=1],
120+
[AC_MSG_RESULT([no])
121+
opal_check_cma_happy=0],
122+
[AC_MSG_RESULT([no (cross-compiling)])
123+
opal_check_cma_happy=0])
124+
CFLAGS=$opal_check_cma_CFLAGS
125125
else
126126
# If we didn't need the defs, then we have process_vm_readv(),
127127
# and CMA is happy.
128-
opal_check_cma_happy=1
128+
opal_check_cma_happy=1
129129
fi
130130

131131
OPAL_VAR_SCOPE_POP

‎config/opal_check_knem.m4

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -24,51 +24,51 @@ dnl
2424
# support, otherwise executes action-if-not-found
2525
AC_DEFUN([OPAL_CHECK_KNEM],[
2626
if test -z "$opal_check_knem_happy" ; then
27-
OPAL_VAR_SCOPE_PUSH([opal_check_knem_$1_save_CPPFLAGS opal_check_knem_dir])
28-
AC_ARG_WITH([knem],
29-
[AS_HELP_STRING([--with-knem(=DIR)],
30-
[Build knem Linux kernel module support, searching for headers in DIR/include])])
27+
OPAL_VAR_SCOPE_PUSH([opal_check_knem_$1_save_CPPFLAGS opal_check_knem_dir])
28+
AC_ARG_WITH([knem],
29+
[AS_HELP_STRING([--with-knem(=DIR)],
30+
[Build knem Linux kernel module support, searching for headers in DIR/include])])
3131

32-
OPAL_CHECK_WITHDIR([knem], [$with_knem], [include/knem_io.h])
33-
opal_check_knem_$1_save_CPPFLAGS="$CPPFLAGS"
32+
OPAL_CHECK_WITHDIR([knem], [$with_knem], [include/knem_io.h])
33+
opal_check_knem_$1_save_CPPFLAGS="$CPPFLAGS"
3434

35-
opal_check_knem_happy=no
35+
opal_check_knem_happy=no
3636

37-
AS_IF([test "$with_knem" != "no"],
38-
[AS_IF([test ! -z "$with_knem" && test "$with_knem" != "yes"],
39-
[opal_check_knem_dir="$with_knem"])
37+
AS_IF([test "$with_knem" != "no"],
38+
[AS_IF([test ! -z "$with_knem" && test "$with_knem" != "yes"],
39+
[opal_check_knem_dir="$with_knem"])
4040

41-
_OPAL_CHECK_PACKAGE_HEADER([ompi_check_knem],
42-
[knem_io.h],
43-
[$opal_check_knem_dir],
44-
[opal_check_knem_happy="yes"],
45-
[])],
46-
[])
41+
_OPAL_CHECK_PACKAGE_HEADER([ompi_check_knem],
42+
[knem_io.h],
43+
[$opal_check_knem_dir],
44+
[opal_check_knem_happy="yes"],
45+
[])],
46+
[])
4747

48-
CPPFLAGS="$CPPFLAGS $ompi_check_knem_CPPFLAGS"
48+
CPPFLAGS="$CPPFLAGS $ompi_check_knem_CPPFLAGS"
4949

50-
# need at least version 0x0000000b
51-
if test "$opal_check_knem_happy" = "yes" ; then
52-
AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
50+
# need at least version 0x0000000b
51+
if test "$opal_check_knem_happy" = "yes" ; then
52+
AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
5353
#include <knem_io.h>
54-
],[
54+
],[
5555
#if KNEM_ABI_VERSION < 0xc
5656
#error "Version less than 0xc"
5757
#endif
58-
])],
59-
[opal_check_knem_happy=yes],
60-
[opal_check_knem_happy=no])
61-
fi
58+
])],
59+
[opal_check_knem_happy=yes],
60+
[opal_check_knem_happy=no])
61+
fi
6262

63-
CPPFLAGS="$opal_check_knem_$1_save_CPPFLAGS"
63+
CPPFLAGS="$opal_check_knem_$1_save_CPPFLAGS"
6464

6565
OPAL_SUMMARY_ADD([Transports], [Shared memory/Linux KNEM], [], [$opal_check_knem_happy])
6666
OPAL_VAR_SCOPE_POP
6767
fi
6868

6969
AS_IF([test "$opal_check_knem_happy" = "yes"],
7070
[$1_CPPFLAGS="[$]$1_CPPFLAGS $ompi_check_knem_CPPFLAGS"
71-
$2],
71+
$2],
7272
[AS_IF([test ! -z "$with_knem" && test "$with_knem" != "no"],
7373
[AC_MSG_ERROR([KNEM support requested but not found. Aborting])])
7474
$3])

‎config/opal_check_package.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ AC_DEFUN([_OPAL_CHECK_PACKAGE_HEADER], [
5555
[$1_CPPFLAGS="$$1_CPPFLAGS -I$dir_prefix/include"
5656
CPPFLAGS="$CPPFLAGS -I$dir_prefix/include"])
5757
AC_CHECK_HEADERS([$2], [opal_check_package_header_happy="yes"], [], [$6])
58-
AS_IF([test "$opal_check_package_header_happy" = "yes"], [$4], [$5])],
58+
AS_IF([test "$opal_check_package_header_happy" = "yes"], [$4], [$5])],
5959
[$4])
6060
unset opal_check_package_header_happy
6161

0 commit comments

Comments
 (0)