Re: [Freeciv-Dev] (PR#39490) Deprecated forms of AC_INIT and AM_INIT_AUTOMAKE

2007-08-07 Thread Marko Lindqvist 

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39490 

On 05/08/07, Marko Lindqvist [EMAIL PROTECTED] wrote:

  Good news is that version.in is now used only by configure.ac. So
 there is no real need to wrap everything in language-independent
 macros.

 This patch converts version.in to not to use autoconf macros.

 m4/version.m4 will be removed at same commit.


 - ML

diff -Nurd -X.diff_ignore freeciv/version.in freeciv/version.in
--- freeciv/version.in	2007-08-06 18:09:20.0 +0300
+++ freeciv/version.in	2007-08-08 03:55:12.0 +0300
@@ -1,18 +1,17 @@
-FREECIV_VERSION_COMMENT(  Copyright (C) 2004 Freeciv team   )
+#  Copyright (C) 2004 Freeciv team
 
-FREECIV_VERSION_COMMENT(  Programming language independent version  )
-FREECIV_VERSION_COMMENT(  definition for freeciv. Macros used here  )
-FREECIV_VERSION_COMMENT(  are defined differently depending on  )
-FREECIV_VERSION_COMMENT(  language used. Don't add comments )
-FREECIV_VERSION_COMMENT(  specific to some language into this file. )
+# Version definition for Freeciv.
 
-FREECIV_VERSION_INFO(2,1,99,[-devel])
+MAJOR_VERSION=2
+MINOR_VERSION=1
+PATCH_VERSION=99
+VERSION_LABEL=-devel
 
-FREECIV_DEVEL_VERSION(1)
-FREECIV_BETA_VERSION(0)
+IS_DEVEL_VERSION=1
+IS_BETA_VERSION=0
 
-FREECIV_NEXT_VERSION([2.2.0])
-FREECIV_RELEASE_MONTH(6)
+NEXT_STABLE_VERSION=2.2.0
+RELEASE_MONTH=1
 
 # Freeciv network capstring: see documentation in common/capstr.c
 #
@@ -24,4 +23,4 @@
 #   - Avoid adding a new mandatory capbility to the development branch for
 # as long as possible.  We want to maintain network compatibility with
 # the stable branch for as long as possible.
-FREECIV_NETWORK_CAPSTRING([+Freeciv.Devel.2007.Aug.06-2])
+NETWORK_CAPSTRING=+Freeciv.Devel.2007.Aug.06-2
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39490) Deprecated forms of AC_INIT and AM_INIT_AUTOMAKE

2007-08-05 Thread Marko Lindqvist 

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39490 

 We are using deprecated versions of AC_INIT and AM_INIT_AUTOMAKE

 Problem in upgrading is that new form of AC_INIT requires package
version. We use autoconf macros to seek version information from
version.in. Of course these macros cannot be used before AC_INIT.
 New form of AM_INIT_AUTOMAKE will work only if new form of AC_INIT is in use.

 Good news is that version.in is now used only by configure.ac. So
there is no real need to wrap everything in language-independent
macros.

 These new forms have been available since autoconf 2.52g and at least
in automake 1.5, so all versions we currently support work with this.


 - ML



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev