Complete.Org: Mailing Lists: Archives: freeciv-dev: July 2002:
[Freeciv-Dev] Remove gettext configure cruft.
Home

[Freeciv-Dev] Remove gettext configure cruft.

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: freeciv-dev@xxxxxxxxxxx
Subject: [Freeciv-Dev] Remove gettext configure cruft.
From: Gaute B Strokkenes <gs234@xxxxxxxxx>
Date: Sun, 21 Jul 2002 15:24:14 +0200

The bug that this is supposed to work around was fixed in gettext
0.10.36.  Sine we require at least 0.10.38, we don't need it anymore.

Index: configure.ac
===================================================================
RCS file: /home/freeciv/CVS/freeciv/configure.ac,v
retrieving revision 1.16
diff -u -r1.16 configure.ac
--- configure.ac        2002/07/19 17:59:11     1.16
+++ configure.ac        2002/07/21 13:18:35
@@ -673,21 +673,6 @@
      fi
    fi]],[[]])
 
-dnl The default behavior of msgmerge breaks 2-byte character
-dnl encodings, as used in ja.po and others.
-dnl We fix this by forcing the "-w 0" option on all msgmerge calls.
-AC_CONFIG_COMMANDS([fc_default-3],[[if test -f po/Makefile ; then
-     if grep 'MSGMERGE = PATH=../src:$$PATH msgmerge -w 0' po/Makefile 
>/dev/null 2>&1 ; then
-       # has already been modified
-       :
-     else
-       echo modifying po/Makefile msgmerge
-       mv -f po/Makefile po/Makefile.tmp
-       sed -e 's/MSGMERGE = PATH=..\/src:$$PATH msgmerge/MSGMERGE = 
PATH=..\/src:$$PATH msgmerge -w 0/' po/Makefile.tmp > po/Makefile
-       rm po/Makefile.tmp
-     fi
-   fi]],[[]])
-
 dnl Most of the C comments copied to freeciv.pot are spurious; 
 dnl change to only copy those with prefix "TRANS:"
 dnl Also add --escape to the arguments to convert extended
Index: configure.in
===================================================================
RCS file: /home/freeciv/CVS/freeciv/configure.in,v
retrieving revision 1.194
diff -u -r1.194 configure.in
--- configure.in        2002/07/19 17:59:11     1.194
+++ configure.in        2002/07/21 13:18:36
@@ -669,23 +669,7 @@
      fi
    fi])
 
-dnl The default behavior of msgmerge breaks 2-byte character
-dnl encodings, as used in ja.po and others.
-dnl We fix this by forcing the "-w 0" option on all msgmerge calls.
-AC_OUTPUT_COMMANDS(
-  [if test -f po/Makefile ; then
-     if grep 'MSGMERGE = PATH=../src:$$PATH msgmerge -w 0' po/Makefile 
>/dev/null 2>&1 ; then
-       # has already been modified
-       :
-     else
-       echo modifying po/Makefile msgmerge
-       mv -f po/Makefile po/Makefile.tmp
-       sed -e 's/MSGMERGE = PATH=..\/src:$$PATH msgmerge/MSGMERGE = 
PATH=..\/src:$$PATH msgmerge -w 0/' po/Makefile.tmp > po/Makefile
-       rm po/Makefile.tmp
-     fi
-   fi])
-
 dnl Most of the C comments copied to freeciv.pot are spurious; 
 dnl change to only copy those with prefix "TRANS:"
 dnl Also add --escape to the arguments to convert extended


-- 
Big Gaute                               http://www.srcf.ucam.org/~gs234/
..  I see TOILET SEATS...


[Prev in Thread] Current Thread [Next in Thread]
  • [Freeciv-Dev] Remove gettext configure cruft., Gaute B Strokkenes <=