diff options
| author | dobey <> | 2004-09-29 16:47:29 +0000 |
|---|---|---|
| committer | dobey <> | 2004-09-29 16:47:29 +0000 |
| commit | 04a034abe8fd504d7ab35965d1903bc56fa91b8e (patch) | |
| tree | 867849f3234997e41e35e6e8f6d9b7885caed79f /intltool.m4 | |
| parent | 9c6d13abb6438e052452dac1b500d6ae77176a30 (diff) | |
| download | intltool-04a034abe8fd504d7ab35965d1903bc56fa91b8e.tar.gz | |
2004-09-29 Rodney Dawes <dobey@novell.com>
* NEWS: Document bug fix for #152020
* Makefile.am: Update script creation rule to sed in the
various hardcoded gettext script paths
* configure.in: Update version to 0.31.3
Add AC_PATH_PROG checks for various gettext scripts
* intltool-merge.in.in: Update to use $ICONV, $INTLTOOL_ICONV, or the
hardcoded path that we replace @INTLTOOL_ICONV@ with
* intltool-update.in.in (GenerateHeaders): Use @INTLTOOL_EXTRACT@ path
(GeneratePOTemplate): Use @INTLTOOL_XGETTEXT@ or $XGETTEXT for path
(POFile_Update): Use $MSGMERGE or @INTLTOOL_MSGMERGE@ for the path
(Console_Write_TranslationStatus): Use $MSGFMT or @INTLTOOL_MSGFMT@
(Console_Write_CoverageReport): Use $MSGFMT or @INTLTOOL_MSGFMT@ path
* intltool.m4 (AC_PROG_INTLTOOL):
Add AC_PATH_PROG checks for various gettext scripts we use
Replace the variables we get with AC_PATH_PROG in AC_OUTPUT_COMMANDS
Fixes #152020
Diffstat (limited to 'intltool.m4')
| -rw-r--r-- | intltool.m4 | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/intltool.m4 b/intltool.m4 index 6cab1b6..9d81baa 100644 --- a/intltool.m4 +++ b/intltool.m4 @@ -104,6 +104,11 @@ if test "x$2" != "xno-xml"; then fi fi +AC_PATH_PROG(ICONV, iconv, iconv) +AC_PATH_PROG(MSGFMT, msgfmt, msgfmt) +AC_PATH_PROG(MSGMERGE, msgmerge, msgmerge) +AC_PATH_PROG(XGETTEXT, xgettext, xgettext) + # Remove file type tags (using []) from po/POTFILES. ifdef([AC_DIVERSION_ICMDS],[ @@ -130,7 +135,15 @@ ifdef([AC_DIVERSION_ICMDS],[ AC_OUTPUT_COMMANDS([ -sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${ac_aux_dir}/intltool-extract.in > intltool-extract.out +intltool_edit="-e \"s:@INTLTOOL_EXTRACT@:${INTLTOOL_EXTRACT}:g\" \ + -e \"s:@INTLTOOL_ICONV@:${ICONV}:g\" \ + -e \"s:@INTLTOOL_MSGFMT@:${MSGFMT}:g\" \ + -e \"s:@INTLTOOL_MSGMERGE@:${MSGMERGE}:g\" \ + -e \"s:@INTLTOOL_XGETTEXT@:${XGETTEXT}:g\" \ + -e \"s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:g\"" + +eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-extract.in \ + > intltool-extract.out if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then rm -f intltool-extract.out else @@ -139,8 +152,8 @@ fi chmod ugo+x intltool-extract chmod u+w intltool-extract -sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" \ - < ${ac_aux_dir}/intltool-merge.in > intltool-merge.out +eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-merge.in \ + > intltool-merge.out if cmp -s intltool-merge intltool-merge.out 2>/dev/null; then rm -f intltool-merge.out else @@ -149,7 +162,8 @@ fi chmod ugo+x intltool-merge chmod u+w intltool-merge -sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${ac_aux_dir}/intltool-update.in > intltool-update.out +eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-update.in \ + > intltool-update.out if cmp -s intltool-update intltool-update.out 2>/dev/null; then rm -f intltool-update.out else @@ -158,6 +172,8 @@ fi chmod ugo+x intltool-update chmod u+w intltool-update -], INTLTOOL_PERL=${INTLTOOL_PERL} ac_aux_dir=${ac_aux_dir}) +], INTLTOOL_PERL=${INTLTOOL_PERL} ac_aux_dir=${ac_aux_dir} +INTLTOOL_EXTRACT=${INTLTOOL_EXTRACT} ICONV=${ICONV} +MSGFMT=${MSGFMT} MSGMERGE=${MSGMERGE} XGETTEXT=${XGETTEXT}) ]) |