Tweak: rename "deprecated" --> "deleted"

We're dealing with CLI options that have been deleted, not
deprecated.

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
(cherry picked from commit 5aea4446288db9207fbc60f23ee903b149217121)

config/ompi_deleted_options.m4

@@ -8,17 +8,18 @@
 # $HEADER$
 #
 
-AC_DEFUN([OMPI_CHECK_DEPRECATED_OPTIONS],[
-    OPAL_VAR_SCOPE_PUSH(with_pmi_given with_pmi_libdir_given)
+AC_DEFUN([OMPI_CHECK_DELETED_OPTIONS],[
+    OPAL_VAR_SCOPE_PUSH([with_pmi_given with_pmi_libdir_given cxx])
 
+    # --with-pmi options were removed in v5.0
     AC_ARG_WITH([pmi],
                 [AC_HELP_STRING([--with-pmi(=DIR)],
-                                [*DEPRECATED* Build PMI support, optionally adding DIR to the search path (default: no)])],
+                                [*DELETED* Build PMI support, optionally adding DIR to the search path (default: no)])],
                 [with_pmi_given=yes])
 
     AC_ARG_WITH([pmi-libdir],
                 [AC_HELP_STRING([--with-pmi-libdir=DIR],
-                                [*DEPRECATED* Look for libpmi or libpmi2 in the given directory DIR, DIR/lib or DIR/lib64])],
+                                [*DELETED* Look for libpmi or libpmi2 in the given directory DIR, DIR/lib or DIR/lib64])],
                 [with_pmi_libdir_given=yes])
 
     if test "$with_pmi_given" = "yes" || test "$with_pmi_libdir_given" = "yes"; then

configure.ac

@@ -192,8 +192,8 @@ if test "$OMPI_TOP_BUILDDIR" != "$OMPI_TOP_SRCDIR"; then
     AC_MSG_NOTICE([Detected VPATH build])
 fi
 
-# Check for deprecated options
-OMPI_CHECK_DEPRECATED_OPTIONS
+# Check for deprecated/deleted options
+OMPI_CHECK_DELETED_OPTIONS
 
 # Setup the top of the opal/include/opal_config.h file
 

prrte

@@ -1 +1 @@
-Subproject commit 53296629f9aae70a6cd2586c77306a499e5b573a
+Subproject commit c2e2231cc47c3df0fb3e40c130a9fecd1ca5cacf