Alle mercoledì 3 ottobre 2012, Thomas Schwinge ha scritto: > Hi! > > On Wed, 3 Oct 2012 17:50:38 +0200, Pino Toscano <toscano.p...@tiscali.it> wrote: > > Alle martedì 2 ottobre 2012, Thomas Schwinge ha scritto: > > > On Mon, 1 Oct 2012 19:59:35 +0200, Pino Toscano > > > > <toscano.p...@tiscali.it> wrote: > > > > Alle giovedì 27 settembre 2012, Thomas Schwinge ha scritto: > > > > > --with-pkgversion=PKG Use PKG in the version string > > > > > in place > > > > > > > > > > of "GCC" > > > > > > > > > > Without setting that: > > > > > i686-pc-gnu-gcc (GCC) 4.7.0 20110905 (experimental) > > > > > > > > > > With setting it: > > > > > gcc (Debian 4.7.1-7) 4.7.1 > > > > > > > > > > (Search for case-insensitive pkgversion in config/acx.m4, > > > > > gcc/Makefile.in, gcc/toplev.c, gcc/version.c.) Would that > > > > > seem reasonable for GNU Mach, too? > > > > I see, so you are suggesting to modify the default version string > > to be > > > > something like: > > | gnumach (GNU Mach) 1.3.99 > > > > with --with-pkgversion affecting the part in brackets, so > > --with-pkgversion="My own, #1" would produce > > > > | gnumach (My own, #1) 1.3.99 > > Yes. But if you don't think that's worth it/don't feel like working > on that, please just commit your previous patch. > > > ? If so, then what should be the prefix and the default pkgversion > > to use? > > I think what you suggested about looks fine.
Ok, new version attached. -- Pino Toscano
From 2bc7dc59318264264862d080641874be423e3407 Mon Sep 17 00:00:00 2001 From: Pino Toscano <toscano.p...@tiscali.it> Date: Thu, 4 Oct 2012 18:10:36 +0200 Subject: [PATCH] Change the version string Switch the default version string to "gnumach (PKGVERSION) VERSION", with PKGVERSION being "GNU Mach" (i.e. the package name) by default, and overridable by the user with --with-pkgversion=PKG on configure. * configure.ac (--with-pkgversion): New option. (PKGVERSION, PACKAGE_SHORTNAME): New variables. * version.c.in (version): Change it to "SHORTNAME (PKGVERSION) VERSION". * version.m4 (AC_PACKAGE_SHORTNAME): New define. --- configure.ac | 10 ++++++++++ version.c.in | 2 +- version.m4 | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3a7d3be..b8388ec 100644 --- a/configure.ac +++ b/configure.ac @@ -101,6 +101,16 @@ AC_CHECK_PROG([PATCH], [patch], [patch], [patch-not-found]) # configure fragments. # +# Configure the pkgversion string. +AC_ARG_WITH([pkgversion], + AS_HELP_STRING([--with-pkgversion=PKG], + [Use PKG in the version string in place of "AC_PACKAGE_NAME"]), + [PKGVERSION="$withval"], + [PKGVERSION=$PACKAGE_NAME] +) +AC_SUBST([PACKAGE_SHORTNAME], [AC_PACKAGE_SHORTNAME]) +AC_SUBST([PKGVERSION]) + # The test suite. m4_include([tests/configfrag.ac]) diff --git a/version.c.in b/version.c.in index d894d7f..f115e11 100644 --- a/version.c.in +++ b/version.c.in @@ -1,2 +1,2 @@ /* @configure_input@ */ -const char version[] = "@PACKAGE_NAME@ @PACKAGE_VERSION@"; +const char version[] = "@PACKAGE_SHORTNAME@ (@PKGVERSION@) @PACKAGE_VERSION@"; diff --git a/version.m4 b/version.m4 index 3bf4275..47df223 100644 --- a/version.m4 +++ b/version.m4 @@ -2,3 +2,4 @@ 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]) +m4_define([AC_PACKAGE_SHORTNAME],[gnumach]) -- 1.7.10.4
signature.asc
Description: This is a digitally signed message part.
