<URL: http://bugs.freeciv.org/Ticket/Display.html?id=38126 >

 You currently can't have commas or spaces in network capstring. That
is, you cannot have more than one capability. Attached patch fixes
that. Meant for both trunk and S2_1 as we need capabilities in S2_1
too.

 IMO we should quote everything in configure.ac instead of just
relying in the fact that it usually works even without.


 - ML

diff -Nurd -X.diff_ignore freeciv/configure.ac freeciv/configure.ac
--- freeciv/configure.ac	2007-03-05 19:14:36.000000000 +0200
+++ freeciv/configure.ac	2007-03-14 09:21:41.000000000 +0200
@@ -26,21 +26,21 @@
 dnl  AC_DEFINE_UNQUOTED(VERSION, $VERSION, [Version number])
 dnl  AC_SUBST(VERSION)
 
-AC_DEFINE_UNQUOTED(MAJOR_VERSION, $MAJOR_VERSION, [Major version])
-AC_DEFINE_UNQUOTED(MINOR_VERSION, $MINOR_VERSION, [Minor version])
-AC_DEFINE_UNQUOTED(PATCH_VERSION, $PATCH_VERSION, [Patch version])
-AC_DEFINE_UNQUOTED(VERSION_LABEL, "${VERSION_LABEL}", [Version label])
-AC_DEFINE_UNQUOTED(VERSION_STRING, "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${VERSION_LABEL}", [Version string])
-AC_DEFINE_UNQUOTED(IS_DEVEL_VERSION, $IS_DEVEL_VERSION, [Is this a devel version])
-AC_DEFINE_UNQUOTED(IS_BETA_VERSION, $IS_BETA_VERSION, [Is this a beta version])
-AC_DEFINE_UNQUOTED(NEXT_STABLE_VERSION, "$NEXT_STABLE_VERSION", [Version number of next release])
-AC_DEFINE_UNQUOTED(RELEASE_MONTH, $RELEASE_MONTH, [Month next version will be released])
-AC_SUBST(MAJOR_VERSION)
-AC_SUBST(MINOR_VERSION)
+AC_DEFINE_UNQUOTED([MAJOR_VERSION], [$MAJOR_VERSION], [Major version])
+AC_DEFINE_UNQUOTED([MINOR_VERSION], [$MINOR_VERSION], [Minor version])
+AC_DEFINE_UNQUOTED([PATCH_VERSION], [$PATCH_VERSION], [Patch version])
+AC_DEFINE_UNQUOTED([VERSION_LABEL], ["${VERSION_LABEL}"], [Version label])
+AC_DEFINE_UNQUOTED([VERSION_STRING], ["${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${VERSION_LABEL}"], [Version string])
+AC_DEFINE_UNQUOTED([IS_DEVEL_VERSION], [$IS_DEVEL_VERSION], [Is this a devel version])
+AC_DEFINE_UNQUOTED([IS_BETA_VERSION], [$IS_BETA_VERSION], [Is this a beta version])
+AC_DEFINE_UNQUOTED([NEXT_STABLE_VERSION], ["$NEXT_STABLE_VERSION"], [Version number of next release])
+AC_DEFINE_UNQUOTED([RELEASE_MONTH], [$RELEASE_MONTH], [Month next version will be released])
+AC_SUBST([MAJOR_VERSION])
+AC_SUBST([MINOR_VERSION])
 
-AC_DEFINE_UNQUOTED(NETWORK_CAPSTRING, "$NETWORK_CAPSTRING",
+AC_DEFINE_UNQUOTED([NETWORK_CAPSTRING], ["$NETWORK_CAPSTRING"],
 		   [Network capability string])
-AC_SUBST(NETWORK_CAPSTRING)
+AC_SUBST([NETWORK_CAPSTRING])
 
 dnl Initialize automake stuff
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
@@ -480,8 +480,8 @@
 AC_SUBST(CLIENT_LDFLAGS)
 AC_SUBST(SOUND_CFLAGS)
 AC_SUBST(SOUND_LIBS)
-AC_SUBST(VERSION_WITHOUT_LABEL)
-AC_SUBST(VERSION_LABEL)
+AC_SUBST([VERSION_WITHOUT_LABEL])
+AC_SUBST([VERSION_LABEL])
 AM_CONDITIONAL(SDL, test "x$SDL_mixer" = "xyes")
 AM_CONDITIONAL(CLIENT_GUI_SDL, test "$gui_sources" = "gui-sdl")
 AM_CONDITIONAL(CLIENT_GUI_GTK_2_0, test "$gui_sources" = "gui-gtk-2.0")
diff -Nurd -X.diff_ignore freeciv/m4/version.m4 freeciv/m4/version.m4
--- freeciv/m4/version.m4	2007-03-05 19:13:41.000000000 +0200
+++ freeciv/m4/version.m4	2007-03-14 09:11:24.000000000 +0200
@@ -15,8 +15,8 @@
  PATCH_VERSION="$3"
  VERSION_LABEL="$4"
 ])
-AC_DEFUN([FREECIV_DEVEL_VERSION], [IS_DEVEL_VERSION="$1"])
-AC_DEFUN([FREECIV_BETA_VERSION], [IS_BETA_VERSION="$1"])
-AC_DEFUN([FREECIV_NEXT_VERSION], [NEXT_STABLE_VERSION="$1"])
-AC_DEFUN([FREECIV_RELEASE_MONTH], [RELEASE_MONTH="$1"])
-AC_DEFUN([FREECIV_NETWORK_CAPSTRING], [NETWORK_CAPSTRING="$1"])
+AC_DEFUN([FREECIV_DEVEL_VERSION], [IS_DEVEL_VERSION=$1])
+AC_DEFUN([FREECIV_BETA_VERSION], [IS_BETA_VERSION=$1])
+AC_DEFUN([FREECIV_NEXT_VERSION], [NEXT_STABLE_VERSION=$1])
+AC_DEFUN([FREECIV_RELEASE_MONTH], [RELEASE_MONTH=$1])
+AC_DEFUN([FREECIV_NETWORK_CAPSTRING], [NETWORK_CAPSTRING=$1])
diff -Nurd -X.diff_ignore freeciv/version.in freeciv/version.in
--- freeciv/version.in	2007-03-05 19:14:36.000000000 +0200
+++ freeciv/version.in	2007-03-14 09:21:59.000000000 +0200
@@ -6,12 +6,12 @@
 FREECIV_VERSION_COMMENT("  language used. Don't add comments             ")
 FREECIV_VERSION_COMMENT("  specific to some language into this file.     ")
 
-FREECIV_VERSION_INFO(2,1,0,"-beta3")
+FREECIV_VERSION_INFO(2,1,0,["-beta3"])
 
 FREECIV_DEVEL_VERSION(0)
 FREECIV_BETA_VERSION(1)
 
-FREECIV_NEXT_VERSION("2.1.0")
+FREECIV_NEXT_VERSION(["2.1.0"])
 FREECIV_RELEASE_MONTH(4)
 
 # Freeciv network capstring: see documentation in common/capstr.c
@@ -24,4 +24,4 @@
 #   - Avoid adding a new manditory 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("+2.1c")
+FREECIV_NETWORK_CAPSTRING(["+2.1c"])
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to