Simplify the setting of MPI_VERSION a bit.

Move the parsing to autogen time, so configure can
grab it and export it.

Signed-off-by: Austen Lauria <[email protected]>

Author: awlauria

autogen.pl

@@ -1090,6 +1090,12 @@ sub export_version {
     $m4 .= "m4_define([OMPI_${name}_NUMERIC_MIN_VERSION], [$hex])\n";
 }
 
+sub export_mpi_version {
+    my ($name,$version) = @_;
+    $version =~ s/[^a-zA-Z0-9,.]//g;
+    $m4 .= "m4_define([$name], [$version])\n";
+}
+
 sub get_and_define_min_versions() {
 
     open(IN, "VERSION") || my_die "Can't open VERSION";
@@ -1131,6 +1137,16 @@ ()
                   export_version("EVENT", $fields[1]);
               }
           }
+          elsif($fields[0] eq "mpi_standard_version") {
+              if ($fields[1] ne "\n") {
+                  export_mpi_version("MPI_VERSION_NUM", $fields[1]);
+              }
+          }
+          elsif($fields[0] eq "mpi_standard_subversion") {
+              if ($fields[1] ne "\n") {
+                  export_mpi_version("MPI_SUBVERSION_NUM", $fields[1]);
+              }
+          }
     }
     close(IN);
 }

config/opal_get_version.m4

@@ -100,27 +100,3 @@ m4_define([OPAL_GET_VERSION],[
                  [AC_MSG_RESULT([$$2_REPO_REV])])
     fi
 ])
-
-# OPAL_GET_MPI_STANDARD_VERSION(version_file)
-# -----------------------------------------------
-# parse version_file for MPI Standard version information, setting
-# the following shell variables:
-#
-#  MPI_VERSION
-#  MPI_SUBVERSION
-m4_define([OPAL_GET_MPI_STANDARD_VERSION],[
-    dnl quote eval to suppress macro expansion with non-GNU m4
-    if test -f "$1"; then
-        srcdir=`dirname $1`
-        mpi_standard_vers=`sed -n "
-        t clear
-        : clear
-        s/^mpi_standard_version/MPI_VERSION/
-        s/^mpi_standard_subversion/MPI_SUBVERSION/
-        t print
-        b
-        : print
-        p" < "$1"`
-        [eval] "$mpi_standard_vers"
-    fi
-])

config/opal_save_version.m4

@@ -66,19 +66,17 @@ AC_DEFUN([OPAL_SAVE_VERSION], [
 
 # OPAL_SAVE_MPI_STANDARD_VERSION(version_file)
 # ----------------------------------------------
-# creates version information for project from version_file, using
-# OPAL_GET_MPI_STANDARD_VERSION().
+# Export MPI versions.
 AC_DEFUN([OPAL_SAVE_MPI_STANDARD_VERSION], [
-    OPAL_GET_MPI_STANDARD_VERSION([$1])
-
-    AC_SUBST([MPI_VERSION])
-    AC_SUBST([MPI_SUBVERSION])
 
-    AC_DEFINE_UNQUOTED([MPI_VERSION], [$MPI_VERSION],
+    AC_DEFINE_UNQUOTED([MPI_VERSION], [MPI_VERSION_NUM],
                        [MPI Standard Major version number])
-    AC_DEFINE_UNQUOTED([MPI_SUBVERSION], [$MPI_SUBVERSION],
+    AC_DEFINE_UNQUOTED([MPI_SUBVERSION], [MPI_SUBVERSION_NUM],
                        [MPI Standard Minor version number])
 
+    AC_SUBST([MPI_VERSION])
+    AC_SUBST([MPI_SUBVERSION])
+
     AC_MSG_CHECKING([MPI Standard version])
-    AC_MSG_RESULT([$MPI_VERSION.$MPI_SUBVERSION])
+    AC_MSG_RESULT([MPI_VERSION_NUM.MPI_SUBVERSION_NUM])
 ])dnl