Put the OMPI major, minor, release, alpha, and beta integers back in

mpi.h (actually in ompi_config.h).  Also put the total version string
back.

This commit was SVN r5222.

configure.ac

@@ -39,6 +39,20 @@ AC_SUBST(OMPI_WANT_SVN)
 AC_SUBST(OMPI_SVN_R)
 AC_SUBST(OMPI_VERSION)
 
+AC_DEFINE_UNQUOTED(OMPI_MAJOR_VERSION, $OMPI_MAJOR_VERSION,
+    [Major release number of Open MPI])
+AC_DEFINE_UNQUOTED(OMPI_MINOR_VERSION, $OMPI_MINOR_VERSION,
+    [Major release number of Open MPI])
+AC_DEFINE_UNQUOTED(OMPI_RELEASE_VERSION, $OMPI_RELEASE_VERSION,
+    [Major release number of Open MPI])
+AC_DEFINE_UNQUOTED(OMPI_ALPHA_VERSION, $OMPI_ALPHA_VERSION,
+    [Major release number of Open MPI])
+AC_DEFINE_UNQUOTED(OMPI_BETA_VERSION, $OMPI_BETA_VERSION,
+    [Major release number of Open MPI])
+AC_DEFINE_UNQUOTED(OMPI_VERSION, "$OMPI_RELEASE_VERSION",
+    [Major release number of Open MPI])
+
+
 #
 # Start it up
 #

src/tools/ompi_info/Makefile.am

@@ -37,14 +37,8 @@ AM_CPPFLAGS = \
             -DOMPI_BUILD_FCFLAGS="\"@FCFLAGS@\"" \
             -DOMPI_BUILD_LDFLAGS="\"@LDFLAGS@\"" \
             -DOMPI_BUILD_LIBS="\"@LIBS@\"" \
-            -DOMPI_MAJOR_VERSION=@OMPI_MAJOR_VERSION@ \
-            -DOMPI_MINOR_VERSION=@OMPI_MINOR_VERSION@ \
-            -DOMPI_RELEASE_VERSION=@OMPI_RELEASE_VERSION@ \
-            -DOMPI_ALPHA_VERSION=@OMPI_ALPHA_VERSION@ \
-            -DOMPI_BETA_VERSION=@OMPI_BETA_VERSION@ \
             -DOMPI_WANT_SVN=\"@OMPI_WANT_SVN@\" \
-            -DOMPI_SVN_R=\"@OMPI_SVN_R@\" \
-            -DOMPI_VERSION=\"@OMPI_VERSION@\"
+            -DOMPI_SVN_R=\"@OMPI_SVN_R@\"
 
 libs = $(top_builddir)/src/libmpi.la