trans-coord/gnun/server/gnun ChangeLog GNUmakef...

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   09/02/24 20:50:35

Modified files:
        gnun/server/gnun: ChangeLog GNUmakefile NEWS README configure.ac 

Log message:
        * configure.ac: Try to find a recent msgmerge supporting the
        --previous option with AC_PATH_PROGS_FEATURE_CHECK.
        * GNUmakefile (update-po): Pass `--previous'.
        * NEWS: Update.
        * README: Bump gettext requirement to >= 0.16.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.133&r2=1.134
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/README?cvsroot=trans-coord&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/configure.ac?cvsroot=trans-coord&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -b -r1.133 -r1.134
--- ChangeLog   20 Feb 2009 18:14:25 -0000      1.133
+++ ChangeLog   24 Feb 2009 20:50:35 -0000      1.134
@@ -1,3 +1,11 @@
+2009-02-24  Yavor Doganov  <address@hidden>
+
+       * configure.ac: Try to find a recent msgmerge supporting the
+       --previous option with AC_PATH_PROGS_FEATURE_CHECK.
+       * GNUmakefile (update-po): Pass `--previous'.
+       * NEWS: Update.
+       * README: Bump gettext requirement to >= 0.16.
+
 2009-02-20  Yavor Doganov  <address@hidden>
 
        * configure.ac: Post-release version bump.

Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- GNUmakefile 6 Feb 2009 14:20:58 -0000       1.63
+++ GNUmakefile 24 Feb 2009 20:50:35 -0000      1.64
@@ -177,7 +177,7 @@
 # `touched' in order `make' to consider it up-to-date even if there
 # is nothing to merge.
 define update-po
-$(MSGMERGE) --update $$@ $$< && touch $$@
+$(MSGMERGE) --update --previous $$@ $$< && touch $$@
 endef
 
 # The command to mail errors from make-prototype.

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- NEWS        13 Feb 2009 00:22:21 -0000      1.7
+++ NEWS        24 Feb 2009 20:50:35 -0000      1.8
@@ -1,5 +1,9 @@
 GNUnited Nations NEWS - User visible changes.
 
+* Changes in GNUnited Nations 0.3 (2009-??-??)
+
+** GNU gettext >= 0.16 is required for `msgmerge --previous' support.
+
 * Changes in GNUnited Nations 0.2 (2009-02-13)
 
 ** GNUmakefile.team supports Subversion repositories.

Index: README
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/README,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- README      21 Aug 2008 21:00:41 -0000      1.6
+++ README      24 Feb 2009 20:50:35 -0000      1.7
@@ -2,7 +2,7 @@
 ------------
 GNU Make >= 3.81 (prereleases of 3.81 also work)
 GNU Sed
-GNU Gettext (>= 0.14)
+GNU Gettext (>= 0.16)
 GNU M4 (>= 1.4.8)
 GNU Guile (>= 1.6)
 GNU Awk

Index: configure.ac
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/configure.ac,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- configure.ac        20 Feb 2009 18:14:25 -0000      1.11
+++ configure.ac        24 Feb 2009 20:50:35 -0000      1.12
@@ -61,7 +61,13 @@
 AC_ARG_VAR([MSGFMT], [the `msgfmt' program])
 AC_CHECK_PROGS([MSGFMT], [msgfmt gmsgfmt])
 AC_ARG_VAR([MSGMERGE], [the `msgmerge' program])
-AC_CHECK_PROGS([MSGMERGE], [msgmerge gmsmerge])
+AC_CACHE_CHECK([for msgmerge that supports --previous],
+               [ac_cv_path_MSGMERGE],
+  [AC_PATH_PROGS_FEATURE_CHECK([MSGMERGE], [msgmerge gmsgmerge],
+    [[$ac_path_MSGMERGE --previous /dev/null /dev/null 2>/dev/null \
+      && ac_cv_path_MSGMERGE=$ac_path_MSGMERGE]],
+      [AC_MSG_WARN([none found -- consider updating gettext])])])
+AC_SUBST([MSGMERGE], [$ac_cv_path_MSGMERGE])
 
 AC_PATH_PROG([GUILE], [guile])