diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | m4macros/xdt-i18n.m4 | 10 | ||||
| -rw-r--r-- | scripts/xdt-autogen.in | 22 |
3 files changed, 38 insertions, 0 deletions
@@ -1,3 +1,9 @@ +2005-03-08 Benedikt Meurer <benny@xfce.org> + + * scripts/xdt-autogen.in, m4macros/xdt-i18n.m4: Add better handling + of XGETTEXT_ARGS to automatically support the O_() translation + keyword. + 2005-03-05 Benedikt Meurer <benny@xfce.org> * scripts/xdt-autogen.in: Fix a type where configure.ac was still diff --git a/m4macros/xdt-i18n.m4 b/m4macros/xdt-i18n.m4 index 921c5e4..8a2ae96 100644 --- a/m4macros/xdt-i18n.m4 +++ b/m4macros/xdt-i18n.m4 @@ -49,6 +49,16 @@ AC_DEFUN([XDT_I18N], ]) AC_MSG_RESULT([$localedir]) AC_SUBST([localedir]) + + dnl Determine additional xgettext flags + AC_MSG_CHECKING([for additional xgettext flags]) + if test x"$XGETTEXT_ARGS" = x""; then + XGETTEXT_ARGS="--keyword=O_"; + else + XGETTEXT_ARGS="$XGETTEXT_ARGS --keyword=O_"; + fi + AC_SUBST([XGETTEXT_ARGS]) + AC_MSG_RESULT([$XGETTEXT_ARGS]) ]) diff --git a/scripts/xdt-autogen.in b/scripts/xdt-autogen.in index f33e6a9..e50baa3 100644 --- a/scripts/xdt-autogen.in +++ b/scripts/xdt-autogen.in @@ -313,6 +313,28 @@ for configure_file in ${CONFIGURE_FILES}; do ${XDT_PROG_INTLTOOLIZE} --automake --copy --force) || exit 1 fi + # patch the po/Makefile.in.in to take into account the setting of + # XGETTEXT_ARGS properly + if test -f "${source_dir}/po/Makefile.in.in"; then + grep -q '^XGETTEXT_ARGS[ ]*=[ ]*@XGETTEXT_ARGS@$' \ + "${source_dir}/po/Makefile.in.in" 2> /dev/null + if test $? -ne 0; then + echo "Patching file 'po/Makefile.in.in'" + sed \ + -e 's/^\(XGETTEXT[ ]*=[ ]*@XGETTEXT@\)[ ]*$/\1 $(XGETTEXT_ARGS)/' \ + -e 's/^\(MSGMERGE[ ]*=\)[ ]*\(INTLTOOL_EXTRACT=\)/\1 XGETTEXT_ARGS="$(XGETTEXT_ARGS)" \2/' \ + -e 's/^\(GENPOT[ ]*=\)[ ]*\(INTLTOOL_EXTRACT=\)/\1 XGETTEXT_ARGS="$(XGETTEXT_ARGS)" \2/' \ + -e "/^XGETTEXT = @XGETTEXT@/{ +i\\ +XGETTEXT_ARGS = @XGETTEXT_ARGS@ +}" < "${source_dir}/po/Makefile.in.in" > "${source_dir}/po/Makefile.in.in.tmp" + if test $? -eq 0; then + mv -f "${source_dir}/po/Makefile.in.in.tmp" \ + "${source_dir}/po/Makefile.in.in" || exit 1 + fi + fi + fi + if grep "^AC_PROG_LIBTOOL" "${configure_file}" >/dev/null 2>&1; then (echo "Running ${XDT_PROG_LIBTOOLIZE} --force --copy..." && cd "${source_dir}" && |