Hi! On Tue, 2011-11-08 at 00:13:51 +0100, Thomas Schwinge wrote: > In GNU Mach, we have a version.m4 where these fields are defined one and > for all. (I argue that a package's version definition does not really > belong into a generic, otherwise version-agnostic configuration system's > file.) (But on the other hand, *version*.m4 is likely not the most > suitable name for defining a package's name.) (Are we bike-shedding > yet?)
I introduced that file because at the time the source tree had multiple configure.in, so sharing the definitions seemed saner. But then this could have been merged back once the build system was converted to a single configure.ac. The attached patch does just that. Regarding the definition of the version, I tend to agree, and I'd say it should be generated automatically from the nearest git tag (but then gnumach does not have any tags right now :). There's such a script in gnulib (git-version-gen) that could be used, if GPL3+ would be an issue I implemented a similar one but GPL2+ for dpkg (get-version) some time ago. thanks, guillem
>From 2ed11129b7253525911f7d2e68a20157d86a2a6d Mon Sep 17 00:00:00 2001 From: Guillem Jover <guil...@hadrons.org> Date: Thu, 10 Nov 2011 04:17:19 +0100 Subject: [PATCH gnumach] Inline version.m4 into configure.ac * version.m4: Remove file. Move m4 definitions to... * configure.ac (AC_INIT): ...here. --- configure.ac | 6 ++---- version.m4 | 4 ---- 2 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 version.m4 diff --git a/configure.ac b/configure.ac index 3a7d3be..7dada9a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Configure script for GNU Mach. -dnl Copyright (C) 1997, 1998, 1999, 2004, 2006, 2007, 2008, 2010 Free Software +dnl Copyright (C) 1997-1999, 2004, 2006-2008, 2010-2011 Free Software dnl Foundation, Inc. dnl Permission to use, copy, modify and distribute this software and its @@ -16,9 +16,7 @@ dnl USE OF THIS SOFTWARE. AC_PREREQ([2.57]) -m4_include([version.m4]) -AC_INIT([AC_PACKAGE_NAME], [AC_PACKAGE_VERSION], [AC_PACKAGE_BUGREPORT], - [AC_PACKAGE_TARNAME]) +AC_INIT([GNU Mach], [1.3.99], [bug-hurd@gnu.org], [gnumach]) AC_CONFIG_SRCDIR([kern/ipc_kobject.c]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/version.m4 b/version.m4 deleted file mode 100644 index 3bf4275..0000000 --- a/version.m4 +++ /dev/null @@ -1,4 +0,0 @@ -m4_define([AC_PACKAGE_NAME],[GNU Mach]) -m4_define([AC_PACKAGE_VERSION],[1.3.99]) -m4_define([AC_PACKAGE_BUGREPORT],[bug-hurd@gnu.org]) -m4_define([AC_PACKAGE_TARNAME],[gnumach]) -- 1.7.7.2
