texinfo/m4 ChangeLog,1.3,1.4 po.m4,1.2,1.3

[karl]

Update of /cvsroot/texinfo/texinfo/m4
In directory sheep:/tmp/cvs-serv4475/m4

Modified Files:
        ChangeLog po.m4 
Log Message:
gettext 0.14.1

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/m4/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ChangeLog   21 Dec 2003 00:26:16 -0000      1.3
--- ChangeLog   5 Feb 2004 16:48:34 -0000       1.4
***************
*** 1,2 ****
--- 1,6 ----
+ 2004-02-05  gettextize  <address@hidden>
+ 
+       * po.m4: Upgrade to gettext-0.14.1.
+ 
  2003-12-20  gettextize  <address@hidden>
  

Index: po.m4
===================================================================
RCS file: /cvsroot/texinfo/texinfo/m4/po.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** po.m4       13 Dec 2003 21:18:46 -0000      1.2
--- po.m4       5 Feb 2004 16:48:34 -0000       1.3
***************
*** 1,3 ****
! # po.m4 serial 2 (gettext-0.13)
  dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
  dnl This file is free software, distributed under the terms of the GNU
--- 1,3 ----
! # po.m4 serial 3 (gettext-0.14)
  dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
  dnl This file is free software, distributed under the terms of the GNU
***************
*** 324,327 ****
--- 324,329 ----
    # Compute MSGFILES
    # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
+   # Compute RESOURCESDLLFILES
+   # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob 
$(lang))/$(DOMAIN).resources.dll)
    case "$ac_given_srcdir" in
      .) srcdirpre= ;;
***************
*** 336,339 ****
--- 338,342 ----
    QMFILES=
    MSGFILES=
+   RESOURCESDLLFILES=
    for lang in $ALL_LINGUAS; do
      POFILES="$POFILES $srcdirpre$lang.po"
***************
*** 346,349 ****
--- 349,354 ----
      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 
'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
      MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
+     frobbedlang=`echo $lang | sed -e 's/_/-/g'`
+     RESOURCESDLLFILES="$RESOURCESDLLFILES 
$srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
    done
    # CATALOGS depends on both $ac_dir and the user's LINGUAS
***************
*** 377,380 ****
--- 382,386 ----
    QTCATALOGS=
    TCLCATALOGS=
+   CSHARPCATALOGS=
    if test -n "$INST_LINGUAS"; then
      for lang in $INST_LINGUAS; do
***************
*** 384,391 ****
        frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 
'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
        TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
      done
    fi
  
!   sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e 
"s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e 
"s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e 
"s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e 
"s|@MSGFILES@|$MSGFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e 
"s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e 
"s|@TCLCATALOGS@|$TCLCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > 
"$ac_file.tmp"
    if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
      # Add dependencies that cannot be formulated as a simple suffix rule.
--- 390,399 ----
        frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 
'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
        TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
+       frobbedlang=`echo $lang | sed -e 's/_/-/g'`
+       CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
      done
    fi
  
!   sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e 
"s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e 
"s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e 
"s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e 
"s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e 
"s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e 
"s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e 
"s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" 
> "$ac_file.tmp"
    if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
      # Add dependencies that cannot be formulated as a simple suffix rule.
***************
*** 396,399 ****
--- 404,418 ----
        @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
        \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm 
-f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+ EOF
+     done
+   fi
+   if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
+     # Add dependencies that cannot be formulated as a simple suffix rule.
+     for lang in $ALL_LINGUAS; do
+       frobbedlang=`echo $lang | sed -e 's/_/-/g'`
+       cat >> "$ac_file.tmp" <<EOF
+ $frobbedlang/\$(DOMAIN).resources.dll: $lang.po
+       @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po 
-r \$(DOMAIN)"; \
+       \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r 
"\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
  EOF
      done