diff options
| author | Bruno Haible <bruno@clisp.org> | 2001-05-14 21:36:18 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2001-05-14 21:36:18 +0000 |
| commit | 6e43fcc5742360799dde6419c0db7bf45300d19e (patch) | |
| tree | fc68e7f9271012ff64233aa1206e379e1cce1ecf /m4 | |
| parent | 22b44d7f8fd0b63f239b5b55f47b9cccc8e62c4f (diff) | |
| download | external_gettext-6e43fcc5742360799dde6419c0db7bf45300d19e.zip external_gettext-6e43fcc5742360799dde6419c0db7bf45300d19e.tar.gz external_gettext-6e43fcc5742360799dde6419c0db7bf45300d19e.tar.bz2 | |
Allow more than one po directory in the project.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ChangeLog | 7 | ||||
| -rw-r--r-- | m4/gettext.m4 | 45 |
2 files changed, 30 insertions, 22 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index 2182dad..10b586d 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,10 @@ +2001-05-14 Bruno Haible <haible@clisp.cons.org> + + * gettext.m4 (AM_WITH_NLS): Create po/POTFILES right before + po/Makefile, at config.status run time. Make it work independently of + the subdir name and of the subdir level. + (AM_GNU_GETTEXT): Don't create po/POTFILES at configure time. + 2001-05-11 Bruno Haible <haible@clisp.cons.org> * glibc21.m4: New file, from fileutils-4.1. diff --git a/m4/gettext.m4 b/m4/gettext.m4 index b744d77..7aea84f 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -164,9 +164,29 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "" POSUB=po fi AC_OUTPUT_COMMANDS( - [for f in $CONFIG_FILES; do - case $f in po/Makefile.in | po/Makefile.in:*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + [for ac_file in $CONFIG_FILES; do + # Support "outfile[:infile[:infile...]]" + case "$ac_file" in + *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + esac + # PO directories have a Makefile.in generated from Makefile.in.in. + case "$ac_file" in */Makefile.in) + # Adjust a relative srcdir. + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + case "$ac_given_srcdir" in + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir="$ac_given_srcdir" ;; + *) top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then + rm -f "$ac_dir/POTFILES" + echo creating "$ac_dir/POTFILES" + sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES" + echo creating "$ac_dir/Makefile" + sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + fi ;; esac done]) @@ -319,23 +339,4 @@ strdup tsearch __argz_count __argz_stringify __argz_next]) dnl Enable libtool support if the surrounding package wishes it. INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], []) AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) - - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. But only do this if the po directory - dnl exists in srcdir. - if test -d $srcdir/po; then - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - fi ]) |