VERSION: revert 63075d9

Version numbering and "make dist" are quite complicated/subtle; I'm
not going to get this finished tonight.  So revert VERSION to enable
other people to build.

More fixes coming soon...

VERSION

@@ -9,12 +9,6 @@
 # the version number below are combined to form a single version
 # number string.
 
-# If snapshot=1, then use the value from snapshot_version as the
-# entire Open MPI version (i.e., ignore major, minor, release, and
-# greek).  This is only set to 1 when making snapshot tarballs.
-snapshot=1
-snapshot_version=gitclone
-
 # major, minor, and release are generally combined in the form
 # <major>.<minor>.<release>.  If release is zero, then it is omitted.
 
@@ -31,6 +25,31 @@ release=0
 
 greek=a1
 
+# If want_repo_rev=1, then the repo revision number will be included
+# in the overall Open MPI version number in some form.
+
+want_repo_rev=1
+
+# If repo_rev=-1, then the repository version number will be obtained
+# dynamically at run time, either:
+#
+# 1) via the "svnversion" command (if this is a Subversion checkout)
+#    in the form "r<svn_r>", or
+# 2) via the "hg -v -R tip" command (if this is a Mercurial clone)
+#    in the form of "hg<hash>", using the hash tag at the tip
+# 3) via the "git log -1" command (if this is a Git clone) in the form
+#    of "git<hash>", using the hash tag at the HEAD
+# 4) with the date (if none of the above work) in the form of
+#    "date<date>".
+#
+# Alternatively, if repo_rev is not -1, the value of repo_rev_r will
+# be directly appended to the version string.  This happens during
+# "make dist", for example: if the distribution tarball is being made
+# from an SVN checkout, if repo_rev=-1, then its value is replaced
+# with the output of "svnversion".
+
+repo_rev=-1
+
 # The date when this release was created
 
 date="Unreleased developer copy"