[Freeciv-Dev] Re: gettext remark

[Gaute B Strokkenes <gs234@xxxxxxxxx>]

On Thu, 25 Jul 2002, gs234@xxxxxxxxx wrote:

> Expect a patch soon.

Index: autogen.sh
===================================================================
RCS file: /home/freeciv/CVS/freeciv/autogen.sh,v
retrieving revision 1.8
diff -u -r1.8 autogen.sh
--- autogen.sh  2002/06/26 18:22:56     1.8
+++ autogen.sh  2002/07/25 03:07:17
@@ -147,8 +147,8 @@
 version_check 1 "automake" "ftp://ftp.gnu.org/pub/gnu/automake/"; 1 4 || DIE=1
 if [ "$FC_USE_NLS" = "yes" ]; then
   DIE2=0
-  version_check 1 "xgettext" "ftp://ftp.gnu.org/pub/gnu/gettext/"; 0 10 38 || 
DIE2=1
-  version_check 1 "msgfmt" "ftp://ftp.gnu.org/pub/gnu/gettext/"; 0 10 38 || 
DIE2=1
+  version_check 1 "xgettext" "ftp://ftp.gnu.org/pub/gnu/gettext/"; 0 10 36 || 
DIE2=1
+  version_check 1 "msgfmt" "ftp://ftp.gnu.org/pub/gnu/gettext/"; 0 10 36 || 
DIE2=1
   if [ "$DIE2" -eq 1 ]; then
     echo 
     echo "You may want to use --disable-nls to disable NLS."
Index: configure.ac
===================================================================
RCS file: /home/freeciv/CVS/freeciv/configure.ac,v
retrieving revision 1.18
diff -u -r1.18 configure.ac
--- configure.ac        2002/07/22 21:58:10     1.18
+++ configure.ac        2002/07/25 03:07:18
@@ -174,7 +174,7 @@
   fi
 
   if test "$IS_BETA_VERSION" = "1" || test "$IS_DEVEL_VERSION" = "1"; then
-    AC_MSG_CHECKING(for GNU xgettext version >= 0.10.38)
+    AC_MSG_CHECKING(for GNU xgettext version >= 0.10.36)
     xgettext_version=`$XGETTEXT --version 2>&1 | grep GNU | sed 's/"/ /g'`
     AC_TRY_RUN([
 #include <stdio.h>
@@ -192,7 +192,7 @@
     return 1;
   }
   sscanf(p, "%d.%d.%d", &major, &minor, &patch);
-  if (major < 1 && (minor < 10 || (minor == 10 && patch < 38))) {
+  if (major < 1 && (minor < 10 || (minor == 10 && patch < 36))) {
     return 1;
   }
   return 0;
Index: configure.in
===================================================================
RCS file: /home/freeciv/CVS/freeciv/configure.in,v
retrieving revision 1.196
diff -u -r1.196 configure.in
--- configure.in        2002/07/22 21:58:10     1.196
+++ configure.in        2002/07/25 03:07:18
@@ -173,7 +173,7 @@
   fi
 
   if test "$IS_BETA_VERSION" = "1" || test "$IS_DEVEL_VERSION" = "1"; then
-    AC_MSG_CHECKING(for GNU xgettext version >= 0.10.38)
+    AC_MSG_CHECKING(for GNU xgettext version >= 0.10.36)
     xgettext_version=`$XGETTEXT --version 2>&1 | grep GNU | sed 's/"/ /g'`
     AC_TRY_RUN([
 #include <stdio.h>
@@ -191,7 +191,7 @@
     return 1;
   }
   sscanf(p, "%d.%d.%d", &major, &minor, &patch);
-  if (major < 1 && (minor < 10 || (minor == 10 && patch < 38))) {
+  if (major < 1 && (minor < 10 || (minor == 10 && patch < 36))) {
     return 1;
   }
   return 0;


-- 
Big Gaute                               http://www.srcf.ucam.org/~gs234/
When this load is DONE I think I'll wash it AGAIN..