Merge pull request #8392 from cniethammer/autoconf-2.70-warning-fixes

Update bunch of obsolete autoconf macros

Author: jsquyres

config/ompi_check_gpfs.m4

@@ -38,7 +38,7 @@ AC_DEFUN([OMPI_CHECK_GPFS],[
 
     # Get some configuration information
     AC_ARG_WITH([gpfs],
-        [AC_HELP_STRING([--with-gpfs(=DIR)],
+        [AS_HELP_STRING([--with-gpfs(=DIR)],
              [Build Gpfs support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
     OPAL_CHECK_WITHDIR([gpfs], [$with_gpfs], [include/gpfs.h])
 

config/ompi_check_ime.m4

@@ -25,7 +25,7 @@ AC_DEFUN([OMPI_CHECK_IME],[
 
     # Get some configuration information
     AC_ARG_WITH([ime],
-        [AC_HELP_STRING([--with-ime(=DIR)],
+        [AS_HELP_STRING([--with-ime(=DIR)],
              [Build IME support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
     OPAL_CHECK_WITHDIR([ime], [$with_ime], [include/ime_native.h])
 

config/ompi_check_libhcoll.m4

@@ -20,7 +20,7 @@ AC_DEFUN([OMPI_CHECK_HCOLL],[
     OPAL_VAR_SCOPE_PUSH([ompi_check_hcoll_dir ompi_check_hcoll_libs ompi_check_hcoll_happy CPPFLAGS_save LDFLAGS_save LIBS_save])
 
     AC_ARG_WITH([hcoll],
-        [AC_HELP_STRING([--with-hcoll(=DIR)],
+        [AS_HELP_STRING([--with-hcoll(=DIR)],
              [Build hcoll (Mellanox Hierarchical Collectives) support, optionally adding
               DIR/include and DIR/lib or DIR/lib64 to the search path for headers and libraries])])
 

config/ompi_check_lustre.m4

@@ -42,7 +42,7 @@ AC_DEFUN([OMPI_CHECK_LUSTRE],[
 
     # Get some configuration information
     AC_ARG_WITH([lustre],
-        [AC_HELP_STRING([--with-lustre(=DIR)],
+        [AS_HELP_STRING([--with-lustre(=DIR)],
              [Build Lustre support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
     OPAL_CHECK_WITHDIR([lustre], [$with_lustre], [include/lustre/lustreapi.h])
 

config/ompi_check_plfs.m4

@@ -42,12 +42,12 @@ AC_DEFUN([OMPI_CHECK_PLFS],[
 
     # Get some configuration information
     AC_ARG_WITH([plfs],
-        [AC_HELP_STRING([--with-plfs(=DIR)],
+        [AS_HELP_STRING([--with-plfs(=DIR)],
              [Build Plfs support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
     OPAL_CHECK_WITHDIR([plfs], [$with_plfs], [include/plfs.h])
 
     AC_ARG_WITH([plfs-libs],
-        [AC_HELP_STRING([--with-plfs-libs=LIBS],
+        [AS_HELP_STRING([--with-plfs-libs=LIBS],
                        [Libraries to link with for plfs])])
 
     temp_with_plfs="$with_plfs"

config/ompi_check_psm2.m4

@@ -32,11 +32,11 @@
 AC_DEFUN([OMPI_CHECK_PSM2],[
     if test -z "$ompi_check_psm2_happy" ; then
 	AC_ARG_WITH([psm2],
-		    [AC_HELP_STRING([--with-psm2(=DIR)],
+		    [AS_HELP_STRING([--with-psm2(=DIR)],
 				    [Build PSM2 (Intel PSM2) support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
 	OPAL_CHECK_WITHDIR([psm2], [$with_psm2], [include/psm2.h])
 	AC_ARG_WITH([psm2-libdir],
-		    [AC_HELP_STRING([--with-psm2-libdir=DIR],
+		    [AS_HELP_STRING([--with-psm2-libdir=DIR],
 				    [Search for PSM (Intel PSM2) libraries in DIR])])
 	OPAL_CHECK_WITHDIR([psm2-libdir], [$with_psm2_libdir], [libpsm2.*])
 

config/ompi_check_pvfs2.m4

@@ -38,7 +38,7 @@ AC_DEFUN([OMPI_CHECK_PVFS2],[
 
     # Get some configuration information
     AC_ARG_WITH([pvfs2],
-        [AC_HELP_STRING([--with-pvfs2(=DIR)],
+        [AS_HELP_STRING([--with-pvfs2(=DIR)],
              [Build Pvfs2 support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
     OPAL_CHECK_WITHDIR([pvfs2], [$with_pvfs2], [include/pvfs2.h])
 

config/ompi_check_ucx.m4

@@ -24,11 +24,11 @@ AC_DEFUN([OMPI_CHECK_UCX],[
 
     AS_IF([test -z "$ompi_check_ucx_happy"],
           [AC_ARG_WITH([ucx],
-		       [AC_HELP_STRING([--with-ucx(=DIR)],
+		       [AS_HELP_STRING([--with-ucx(=DIR)],
 				       [Build with Unified Communication X library support])])
 	   OPAL_CHECK_WITHDIR([ucx], [$with_ucx], [include/ucp/api/ucp.h])
 	   AC_ARG_WITH([ucx-libdir],
-		       [AC_HELP_STRING([--with-ucx-libdir=DIR],
+		       [AS_HELP_STRING([--with-ucx-libdir=DIR],
 				       [Search for Unified Communication X libraries in DIR])])
 	   OPAL_CHECK_WITHDIR([ucx-libdir], [$with_ucx_libdir], [libucp.*])
 

config/ompi_check_udapl.m4

@@ -27,11 +27,11 @@ dnl
 # support, otherwise executes action-if-not-found
 AC_DEFUN([OMPI_CHECK_UDAPL],[
     AC_ARG_WITH([udapl],
-        [AC_HELP_STRING([--with-udapl(=DIR)],
+        [AS_HELP_STRING([--with-udapl(=DIR)],
              [Build uDAPL support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
     OPAL_CHECK_WITHDIR([udapl], [$with_udapl], [include/dat/udat.h])
     AC_ARG_WITH([udapl-libdir],
-       [AC_HELP_STRING([--with-udapl-libdir=DIR],
+       [AS_HELP_STRING([--with-udapl-libdir=DIR],
              [Search for uDAPL libraries in DIR])])
     OPAL_CHECK_WITHDIR([udapl-libdir], [$with_udapl_libdir], [libdat.*])
 

config/ompi_configure_options.m4

@@ -34,7 +34,7 @@ opal_show_subtitle "OMPI Configuration options"
 # Disable MPI layer?
 #
 AC_ARG_ENABLE([mpi],
-  [AC_HELP_STRING([--disable-mpi],
+  [AS_HELP_STRING([--disable-mpi],
      [Disable building the MPI layer (default:enabled)])])
 
 #
@@ -46,9 +46,9 @@ AC_ARG_ENABLE([mpi],
 #
 
 AC_MSG_CHECKING([if want compile-time warnings inside of mpi.h])
-AC_ARG_ENABLE(mpi-interface-warning,
-    AC_HELP_STRING([--enable-mpi-interface-warning],
-                   [enable compile-time warnings when deprecated MPI functions are used (default: enabled)]))
+AC_ARG_ENABLE([mpi-interface-warning],
+    [AS_HELP_STRING([--enable-mpi-interface-warning],
+                   [enable compile-time warnings when deprecated MPI functions are used (default: enabled)])])
 if test "$enable_mpi_interface_warning" != "no"; then
     AC_MSG_RESULT([yes])
     OMPI_WANT_MPI_INTERFACE_WARNING=1
@@ -64,9 +64,9 @@ AC_DEFINE_UNQUOTED([OMPI_WANT_MPI_INTERFACE_WARNING], [$OMPI_WANT_MPI_INTERFACE_
 #
 
 AC_MSG_CHECKING([if want sparse process groups])
-AC_ARG_ENABLE(sparse-groups,
-    AC_HELP_STRING([--enable-sparse-groups],
-                   [enable sparse process groups (default: not enabled)]))
+AC_ARG_ENABLE([sparse-groups],
+    [AS_HELP_STRING([--enable-sparse-groups],
+                   [enable sparse process groups (default: not enabled)])])
 if test "$enable_sparse_groups" = "yes"; then
     AC_MSG_RESULT([yes])
     GROUP_SPARSE=1
@@ -83,9 +83,9 @@ AC_DEFINE_UNQUOTED([OMPI_GROUP_SPARSE],$GROUP_SPARSE,
 #
 
 AC_MSG_CHECKING([if want peruse support])
-AC_ARG_ENABLE(peruse,
-    AC_HELP_STRING([--enable-peruse],
-                   [enable PERUSE interface (default: disabled)]))
+AC_ARG_ENABLE([peruse],
+    [AS_HELP_STRING([--enable-peruse],
+                   [enable PERUSE interface (default: disabled)])])
 if test "$enable_peruse" = "yes"; then
     AC_MSG_RESULT([yes])
     WANT_PERUSE=1
@@ -102,9 +102,9 @@ AM_CONDITIONAL(WANT_PERUSE, test "$WANT_PERUSE" = "1")
 # Fortran MPI bindings
 #
 AC_MSG_CHECKING([if want Fortran MPI bindings])
-AC_ARG_ENABLE(mpi-fortran,
-    AC_HELP_STRING([--enable-mpi-fortran],
-                   [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)]))
+AC_ARG_ENABLE([mpi-fortran],
+    [AS_HELP_STRING([--enable-mpi-fortran],
+                   [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)])])
 
 # These are the 4 monotonically-rising values indicating levels of
 # Fortran bindings support.
@@ -168,7 +168,7 @@ esac
 
 # Remove these when we finally kill them once and for all
 AC_ARG_ENABLE([mpi1-compatibility],
-    [AC_HELP_STRING([--enable-mpi1-compatibility],
+    [AS_HELP_STRING([--enable-mpi1-compatibility],
                     [Enable support for MPI-1.x functions removed from the current MPI standard (MPI-3.x). This option will go away in a future release of Open MPI (default: disabled)])])
 
 if test "x$enable_mpi1_compatibility" = "xyes" ; then
@@ -183,7 +183,7 @@ AC_SUBST([OMPI_ENABLE_MPI1_COMPAT], [$ompi_mpi1_support])
 AM_CONDITIONAL([OMPI_ENABLE_MPI1_COMPAT],[test $ompi_mpi1_support = 1])
 
 AC_ARG_ENABLE([grequest-extensions],
-    [AC_HELP_STRING([--enable-grequest-extensions],
+    [AS_HELP_STRING([--enable-grequest-extensions],
                     [Enable support for Grequest extensions (default: disabled)])])
 
 if test "x$enable_grequest_extensions" = "xyes" ; then
@@ -202,9 +202,9 @@ AM_CONDITIONAL([OMPI_ENABLE_GREQUEST_EXTENSIONS],[test $ompi_grequest_extensions
 #
 
 AC_MSG_CHECKING([if want run-time MPI parameter checking])
-AC_ARG_WITH(mpi-param-check,
-    AC_HELP_STRING([--with-mpi-param-check(=VALUE)],
-                   [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).]))
+AC_ARG_WITH([mpi-param-check],
+    [AS_HELP_STRING([--with-mpi-param-check(=VALUE)],
+                   [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).])])
 mpi_param_check=ompi_mpi_param_check
 if test "$with_mpi_param_check" = "no" || \
    test "$with_mpi_param_check" = "never"; then
@@ -232,7 +232,7 @@ AC_DEFINE_UNQUOTED(OMPI_PARAM_CHECK, $ompi_param_check,
     [Whether we want to check MPI parameters never or possible (an integer constant)])
 
 AC_ARG_ENABLE([io-ompio],
-    [AC_HELP_STRING([--disable-io-ompio],
+    [AS_HELP_STRING([--disable-io-ompio],
         [Disable the ompio MPI-IO component])])
 
 ])dnl