From: Ben Pfaff <blp@gnu.org>
Date: Mon, 15 Feb 2010 21:46:49 +0000 (-0800)
Subject: Allow more version number flexibility, by using Automake "gnu" mode.
X-Git-Tag: v0.7.4~1
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21d3872bf07546c69b979a89563d7c72da34aeb6;p=pspp-builds.git

Allow more version number flexibility, by using Automake "gnu" mode.

The "gnits" mode that PSPP has used for some time constrains version
numbers considerably.  For example, it prevents using two hyphens in the
version number to indicate, for instance, a prerelease and a Git commit
number like 0.8.0-pre1-g12345678.

This commit changes PSPP to use "gnu" mode instead, and then to also
enable the extra options that "gnits" mode enabled automatically
that we still want to use.

The Automake manual discourages using "gnits" mode anyhow:

     ...Unless you are a Gnits standards contributor, it is
     recommended that you avoid this option until such time as the Gnits
     standard is actually published (which may never happen).
---

diff --git a/Makefile.am b/Makefile.am
index b24afdaf..8279cb73 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-AUTOMAKE_OPTIONS = gnits 1.10.1 subdir-objects
+AUTOMAKE_OPTIONS = std-options check-news 1.10.1 subdir-objects
 
 SUBDIRS = gl
 DISTCLEANFILES = ./po/stamp-po xconfigure