[BACK]Return to po.m4 CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / confuse / m4

Diff for /embedaddon/confuse/m4/po.m4 between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2017/01/24 14:48:55 version 1.1.1.2, 2021/03/17 00:49:17
Line 1 Line 1
# po.m4 serial 13 (gettext-0.15)# po.m4 serial 20 (gettext-0.18.2)
dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.dnl Copyright (C) 1995-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation  dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,  dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.  dnl with or without modifications, as long as this notice is preserved.
Line 17  dnl Authors: Line 17  dnl Authors:
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.  dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
 dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.  dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
   
AC_PREREQ(2.50)AC_PREREQ([2.60])
   
 dnl Checks for all prerequisites of the po subdirectory.  dnl Checks for all prerequisites of the po subdirectory.
 AC_DEFUN([AM_PO_SUBDIRS],  AC_DEFUN([AM_PO_SUBDIRS],
 [  [
   AC_REQUIRE([AC_PROG_MAKE_SET])dnl    AC_REQUIRE([AC_PROG_MAKE_SET])dnl
   AC_REQUIRE([AC_PROG_INSTALL])dnl    AC_REQUIRE([AC_PROG_INSTALL])dnl
  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake  AC_REQUIRE([AC_PROG_MKDIR_P])dnl
   AC_REQUIRE([AM_NLS])dnl    AC_REQUIRE([AM_NLS])dnl
   
     dnl Release version of the gettext macros. This is used to ensure that
     dnl the gettext macros and po/Makefile.in.in are in sync.
     AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
   
   dnl Perform the following tests also if --disable-nls has been given,    dnl Perform the following tests also if --disable-nls has been given,
   dnl because they are needed for "make dist" to work.    dnl because they are needed for "make dist" to work.
   
Line 37  AC_DEFUN([AM_PO_SUBDIRS], Line 41  AC_DEFUN([AM_PO_SUBDIRS],
     [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&      [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
      (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],       (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
     :)      :)
  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)  AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
   
   dnl Test whether it is GNU msgfmt >= 0.15.    dnl Test whether it is GNU msgfmt >= 0.15.
 changequote(,)dnl  changequote(,)dnl
Line 84  changequote([,])dnl Line 88  changequote([,])dnl
   test -n "$localedir" || localedir='${datadir}/locale'    test -n "$localedir" || localedir='${datadir}/locale'
   AC_SUBST([localedir])    AC_SUBST([localedir])
   
     dnl Support for AM_XGETTEXT_OPTION.
     test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
     AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
   
   AC_CONFIG_COMMANDS([po-directories], [[    AC_CONFIG_COMMANDS([po-directories], [[
     for ac_file in $CONFIG_FILES; do      for ac_file in $CONFIG_FILES; do
       # Support "outfile[:infile[:infile...]]"        # Support "outfile[:infile[:infile...]]"
Line 94  changequote([,])dnl Line 102  changequote([,])dnl
       case "$ac_file" in */Makefile.in)        case "$ac_file" in */Makefile.in)
         # Adjust a relative srcdir.          # Adjust a relative srcdir.
         ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`          ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
         ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`          ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
         # In autoconf-2.13 it is called $ac_given_srcdir.          # In autoconf-2.13 it is called $ac_given_srcdir.
         # In autoconf-2.50 it is called $srcdir.          # In autoconf-2.50 it is called $srcdir.
Line 110  changequote([,])dnl Line 118  changequote([,])dnl
         if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then          if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
           rm -f "$ac_dir/POTFILES"            rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"            test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[   ]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"          gt_tab=`printf '\t'`
           cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
           POMAKEFILEDEPS="POTFILES.in"            POMAKEFILEDEPS="POTFILES.in"
           # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend            # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
           # on $ac_dir but don't depend on user-specified configuration            # on $ac_dir but don't depend on user-specified configuration
Line 121  changequote([,])dnl Line 130  changequote([,])dnl
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"                test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
             fi              fi
             ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`              ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
            # Hide the ALL_LINGUAS assigment from automake < 1.5.            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'              eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"              POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           else            else
             # The set of available languages was given in configure.in.              # The set of available languages was given in configure.in.
            # Hide the ALL_LINGUAS assigment from automake < 1.5.            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'              eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi            fi
           # Compute POFILES            # Compute POFILES
Line 218  AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], Line 227  AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
 changequote(,)dnl  changequote(,)dnl
   # Adjust a relative srcdir.    # Adjust a relative srcdir.
   ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`    ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
  ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"  ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
   ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`    ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
   # In autoconf-2.13 it is called $ac_given_srcdir.    # In autoconf-2.13 it is called $ac_given_srcdir.
   # In autoconf-2.50 it is called $srcdir.    # In autoconf-2.50 it is called $srcdir.
Line 246  EOT Line 255  EOT
   fi    fi
   
   # A sed script that extracts the value of VARIABLE from a Makefile.    # A sed script that extracts the value of VARIABLE from a Makefile.
     tab=`printf '\t'`
   sed_x_variable='    sed_x_variable='
 # Test if the hold space is empty.  # Test if the hold space is empty.
 x  x
Line 253  s/P/P/ Line 263  s/P/P/
 x  x
 ta  ta
 # Yes it was empty. Look if we have the expected variable definition.  # Yes it was empty. Look if we have the expected variable definition.
/^[      ]*VARIABLE[     ]*=/{/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
   # Seen the first line of the variable definition.    # Seen the first line of the variable definition.
  s/^[   ]*VARIABLE[      ]*=//  s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
   ba    ba
 }  }
 bd  bd
Line 307  changequote([,])dnl Line 317  changequote([,])dnl
     sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`      sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
     ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`      ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
   fi    fi
  # Hide the ALL_LINGUAS assigment from automake < 1.5.  # Hide the ALL_LINGUAS assignment from automake < 1.5.
   eval 'ALL_LINGUAS''=$ALL_LINGUAS_'    eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
   # Compute POFILES    # Compute POFILES
   # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)    # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
Line 397  changequote([,])dnl Line 407  changequote([,])dnl
   fi    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"    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"
     tab=`printf '\t'`
   if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then    if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
     # Add dependencies that cannot be formulated as a simple suffix rule.      # Add dependencies that cannot be formulated as a simple suffix rule.
     for lang in $ALL_LINGUAS; do      for lang in $ALL_LINGUAS; do
       frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`        frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
       cat >> "$ac_file.tmp" <<EOF        cat >> "$ac_file.tmp" <<EOF
 $frobbedlang.msg: $lang.po  $frobbedlang.msg: $lang.po
        @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \${tab}@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; }${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
 EOF  EOF
     done      done
   fi    fi
Line 414  EOF Line 425  EOF
       frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`        frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
       cat >> "$ac_file.tmp" <<EOF        cat >> "$ac_file.tmp" <<EOF
 $frobbedlang/\$(DOMAIN).resources.dll: $lang.po  $frobbedlang/\$(DOMAIN).resources.dll: $lang.po
        @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \${tab}@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; }${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
 EOF  EOF
     done      done
   fi    fi
Line 425  Makefile: $POMAKEFILEDEPS Line 436  Makefile: $POMAKEFILEDEPS
 EOF  EOF
   fi    fi
   mv "$ac_file.tmp" "$ac_file"    mv "$ac_file.tmp" "$ac_file"
   ])
   
   dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
   AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
   [
     XGETTEXT_EXTRA_OPTIONS=
   ])
   
   dnl Registers an option to be passed to xgettext in the po subdirectory.
   AC_DEFUN([AM_XGETTEXT_OPTION],
   [
     AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
     XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
 ])  ])
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>