mirror of
https://github.com/brl/mutter.git
synced 2024-12-01 12:20:47 -05:00
build: Use upstream gettext instead the glib one
Fixes http://bugzilla.clutter-project.org/show_bug.cgi?id=2300
This commit is contained in:
Javier Jardón
Emmanuele Bassi
parent
c4ca75350f
commit
98cac30d82
@ -36,6 +36,8 @@ else
|
|||||||
ACLOCAL="${ACLOCAL-aclocal} $ACLOCAL_FLAGS" autoreconf -v --install || exit $?
|
ACLOCAL="${ACLOCAL-aclocal} $ACLOCAL_FLAGS" autoreconf -v --install || exit $?
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
autopoint --force || exit $?
|
||||||
|
|
||||||
if test -z "$NOCONFIGURE"; then
|
if test -z "$NOCONFIGURE"; then
|
||||||
./configure "$@" && echo "Now type 'make' to compile $PROJECT."
|
./configure "$@" && echo "Now type 'make' to compile $PROJECT."
|
||||||
fi
|
fi
|
||||||
|
|||||||
@ -53,6 +53,7 @@ AM_CPPFLAGS = \
|
|||||||
-DCLUTTER_PREFIX=\""$(prefix)"\" \
|
-DCLUTTER_PREFIX=\""$(prefix)"\" \
|
||||||
-DCLUTTER_LIBDIR=\""$(libdir)"\" \
|
-DCLUTTER_LIBDIR=\""$(libdir)"\" \
|
||||||
-DCLUTTER_DATADIR=\""$(datadir)"\" \
|
-DCLUTTER_DATADIR=\""$(datadir)"\" \
|
||||||
|
-DCLUTTER_LOCALEDIR=\""$(localedir)"\" \
|
||||||
-DCLUTTER_COMPILATION=1 \
|
-DCLUTTER_COMPILATION=1 \
|
||||||
-DCOGL_DISABLE_DEPRECATED \
|
-DCOGL_DISABLE_DEPRECATED \
|
||||||
-DCOGL_ENABLE_EXPERIMENTAL_API \
|
-DCOGL_ENABLE_EXPERIMENTAL_API \
|
||||||
|
|||||||
@ -1093,14 +1093,15 @@ AM_CONDITIONAL(ENABLE_PDFS, [test "x$enable_pdfs" = "xyes"])
|
|||||||
|
|
||||||
dnl === I18N ==================================================================
|
dnl === I18N ==================================================================
|
||||||
|
|
||||||
|
AM_GNU_GETTEXT_VERSION([0.17])
|
||||||
|
AM_GNU_GETTEXT([external])
|
||||||
|
|
||||||
GETTEXT_PACKAGE="clutter-$CLUTTER_API_VERSION"
|
GETTEXT_PACKAGE="clutter-$CLUTTER_API_VERSION"
|
||||||
AC_SUBST(GETTEXT_PACKAGE)
|
AC_SUBST(GETTEXT_PACKAGE)
|
||||||
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,
|
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,
|
||||||
"$GETTEXT_PACKAGE",
|
"$GETTEXT_PACKAGE",
|
||||||
[The prefix for our gettext translation domains.])
|
[The prefix for our gettext translation domains.])
|
||||||
AS_ALL_LINGUAS
|
AS_ALL_LINGUAS
|
||||||
AM_GLIB_GNU_GETTEXT
|
|
||||||
GLIB_DEFINE_LOCALEDIR(CLUTTER_LOCALEDIR)
|
|
||||||
|
|
||||||
dnl ===========================================================================
|
dnl ===========================================================================
|
||||||
|
|
||||||
|
|||||||
@ -1,264 +0,0 @@
|
|||||||
# Makefile for program source directory in GNU NLS utilities package.
|
|
||||||
# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
|
|
||||||
#
|
|
||||||
# This file file be copied and used freely without restrictions. It can
|
|
||||||
# be used in projects which are not available under the GNU Public License
|
|
||||||
# but which still want to provide support for the GNU gettext functionality.
|
|
||||||
# Please note that the actual code is *not* freely available.
|
|
||||||
#
|
|
||||||
# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
|
|
||||||
# instead of PACKAGE and to look for po2tbl in ./ not in intl/
|
|
||||||
#
|
|
||||||
# - Modified by jacob berkman <jacob@ximian.com> to install
|
|
||||||
# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
|
|
||||||
|
|
||||||
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
|
|
||||||
PACKAGE = @PACKAGE@
|
|
||||||
VERSION = @VERSION@
|
|
||||||
|
|
||||||
SHELL = @SHELL@
|
|
||||||
@SET_MAKE@
|
|
||||||
|
|
||||||
srcdir = @srcdir@
|
|
||||||
top_srcdir = @top_srcdir@
|
|
||||||
VPATH = @srcdir@
|
|
||||||
|
|
||||||
prefix = @prefix@
|
|
||||||
exec_prefix = @exec_prefix@
|
|
||||||
datadir = @datadir@
|
|
||||||
datarootdir = @datarootdir@
|
|
||||||
libdir = @libdir@
|
|
||||||
localedir = $(libdir)/locale
|
|
||||||
gnulocaledir = $(datadir)/locale
|
|
||||||
gettextsrcdir = $(datadir)/glib-2.0/gettext/po
|
|
||||||
subdir = po
|
|
||||||
install_sh = @install_sh@
|
|
||||||
mkdir_p = $(install_sh) -d
|
|
||||||
|
|
||||||
INSTALL = @INSTALL@
|
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
|
||||||
|
|
||||||
CC = @CC@
|
|
||||||
GENCAT = @GENCAT@
|
|
||||||
GMSGFMT = @GMSGFMT@
|
|
||||||
MSGFMT = @MSGFMT@
|
|
||||||
XGETTEXT = @XGETTEXT@
|
|
||||||
MSGMERGE = msgmerge
|
|
||||||
|
|
||||||
DEFS = @DEFS@
|
|
||||||
CFLAGS = @CFLAGS@
|
|
||||||
CPPFLAGS = @CPPFLAGS@
|
|
||||||
|
|
||||||
INCLUDES = -I.. -I$(top_srcdir)/intl
|
|
||||||
|
|
||||||
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
|
|
||||||
|
|
||||||
SOURCES =
|
|
||||||
POFILES = @POFILES@
|
|
||||||
GMOFILES = @GMOFILES@
|
|
||||||
DISTFILES = Makefile.in.in POTFILES.in POTFILES.skip $(GETTEXT_PACKAGE).pot \
|
|
||||||
$(POFILES) $(GMOFILES) $(SOURCES)
|
|
||||||
|
|
||||||
POTFILES = \
|
|
||||||
|
|
||||||
CATALOGS = @CATALOGS@
|
|
||||||
CATOBJEXT = @CATOBJEXT@
|
|
||||||
INSTOBJEXT = @INSTOBJEXT@
|
|
||||||
|
|
||||||
.SUFFIXES:
|
|
||||||
.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
|
|
||||||
|
|
||||||
.c.o:
|
|
||||||
$(COMPILE) $<
|
|
||||||
|
|
||||||
.po.pox:
|
|
||||||
$(MAKE) $(GETTEXT_PACKAGE).pot
|
|
||||||
$(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox
|
|
||||||
|
|
||||||
.po.mo:
|
|
||||||
$(MSGFMT) -o $@ $<
|
|
||||||
|
|
||||||
.po.gmo:
|
|
||||||
file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
|
|
||||||
&& rm -f $$file && $(GMSGFMT) -c -o $$file $<
|
|
||||||
|
|
||||||
.po.cat:
|
|
||||||
sed -f ../intl/po2msg.sed < $< > $*.msg \
|
|
||||||
&& rm -f $@ && $(GENCAT) $@ $*.msg
|
|
||||||
|
|
||||||
|
|
||||||
all: all-@USE_NLS@
|
|
||||||
|
|
||||||
all-yes: $(CATALOGS)
|
|
||||||
all-no:
|
|
||||||
|
|
||||||
$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
|
|
||||||
$(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \
|
|
||||||
--add-comments --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=P_ \
|
|
||||||
--keyword=g_dngettext:2,3 \
|
|
||||||
--flag=g_dngettext:2:pass-c-format \
|
|
||||||
--flag=g_strdup_printf:1:c-format \
|
|
||||||
--flag=g_string_printf:2:c-format \
|
|
||||||
--flag=g_string_append_printf:2:c-format \
|
|
||||||
--flag=g_error_new:3:c-format \
|
|
||||||
--flag=g_set_error:4:c-format \
|
|
||||||
--flag=g_markup_printf_escaped:1:c-format \
|
|
||||||
--flag=g_log:3:c-format \
|
|
||||||
--flag=g_print:1:c-format \
|
|
||||||
--flag=g_printerr:1:c-format \
|
|
||||||
--flag=g_printf:1:c-format \
|
|
||||||
--flag=g_fprintf:2:c-format \
|
|
||||||
--flag=g_sprintf:2:c-format \
|
|
||||||
--flag=g_snprintf:3:c-format \
|
|
||||||
--flag=g_scanner_error:2:c-format \
|
|
||||||
--flag=g_scanner_warn:2:c-format \
|
|
||||||
--flag=gtk_message_dialog_format_secondary_markup:2:c-format \
|
|
||||||
--flag=gtk_message_dialog_format_secondary_text:2:c-format \
|
|
||||||
--flag=gtk_message_dialog_new:5:c-format \
|
|
||||||
--flag=gtk_message_dialog_new_with_markup:5:c-format \
|
|
||||||
--files-from=$(srcdir)/POTFILES.in \
|
|
||||||
&& test ! -f $(GETTEXT_PACKAGE).po \
|
|
||||||
|| ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
|
|
||||||
&& mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot )
|
|
||||||
|
|
||||||
install: install-exec install-data
|
|
||||||
install-exec:
|
|
||||||
install-data: install-data-@USE_NLS@
|
|
||||||
install-data-no: all
|
|
||||||
install-data-yes: all
|
|
||||||
$(mkdir_p) $(DESTDIR)$(datadir); \
|
|
||||||
catalogs='$(CATALOGS)'; \
|
|
||||||
for cat in $$catalogs; do \
|
|
||||||
cat=`basename $$cat`; \
|
|
||||||
case "$$cat" in \
|
|
||||||
*.gmo) destdir=$(gnulocaledir);; \
|
|
||||||
*) destdir=$(localedir);; \
|
|
||||||
esac; \
|
|
||||||
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
|
|
||||||
dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
|
|
||||||
$(mkdir_p) $$dir; \
|
|
||||||
if test -r $$cat; then \
|
|
||||||
$(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
|
|
||||||
echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
|
|
||||||
else \
|
|
||||||
$(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
|
|
||||||
echo "installing $(srcdir)/$$cat as" \
|
|
||||||
"$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
|
|
||||||
fi; \
|
|
||||||
if test -r $$cat.m; then \
|
|
||||||
$(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
|
|
||||||
echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
|
|
||||||
else \
|
|
||||||
if test -r $(srcdir)/$$cat.m ; then \
|
|
||||||
$(INSTALL_DATA) $(srcdir)/$$cat.m \
|
|
||||||
$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
|
|
||||||
echo "installing $(srcdir)/$$cat as" \
|
|
||||||
"$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
|
|
||||||
else \
|
|
||||||
true; \
|
|
||||||
fi; \
|
|
||||||
fi; \
|
|
||||||
done
|
|
||||||
if test "$(PACKAGE)" = "glib"; then \
|
|
||||||
$(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
|
|
||||||
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
|
|
||||||
$(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
|
|
||||||
else \
|
|
||||||
: ; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Define this as empty until I found a useful application.
|
|
||||||
installcheck:
|
|
||||||
|
|
||||||
uninstall:
|
|
||||||
catalogs='$(CATALOGS)'; \
|
|
||||||
for cat in $$catalogs; do \
|
|
||||||
cat=`basename $$cat`; \
|
|
||||||
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
|
|
||||||
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
|
|
||||||
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
|
|
||||||
rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
|
|
||||||
rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
|
|
||||||
done
|
|
||||||
if test "$(PACKAGE)" = "glib"; then \
|
|
||||||
rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
check: all
|
|
||||||
|
|
||||||
dvi info tags TAGS ID:
|
|
||||||
|
|
||||||
mostlyclean:
|
|
||||||
rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp
|
|
||||||
rm -fr *.o
|
|
||||||
|
|
||||||
clean: mostlyclean
|
|
||||||
|
|
||||||
distclean: clean
|
|
||||||
rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
|
|
||||||
|
|
||||||
maintainer-clean: distclean
|
|
||||||
@echo "This command is intended for maintainers to use;"
|
|
||||||
@echo "it deletes files that may require special tools to rebuild."
|
|
||||||
rm -f $(GMOFILES)
|
|
||||||
|
|
||||||
distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
|
|
||||||
dist distdir: $(DISTFILES)
|
|
||||||
dists="$(DISTFILES)"; \
|
|
||||||
for file in $$dists; do \
|
|
||||||
ln $(srcdir)/$$file $(distdir) 2> /dev/null \
|
|
||||||
|| cp -p $(srcdir)/$$file $(distdir); \
|
|
||||||
done
|
|
||||||
|
|
||||||
update-po: Makefile
|
|
||||||
$(MAKE) $(GETTEXT_PACKAGE).pot
|
|
||||||
tmpdir=`pwd`; \
|
|
||||||
cd $(srcdir); \
|
|
||||||
catalogs='$(CATALOGS)'; \
|
|
||||||
for cat in $$catalogs; do \
|
|
||||||
cat=`basename $$cat`; \
|
|
||||||
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
|
|
||||||
echo "$$lang:"; \
|
|
||||||
if $(MSGMERGE) $$lang.po $(GETTEXT_PACKAGE).pot -o $$tmpdir/$$lang.new.po; then \
|
|
||||||
if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
|
|
||||||
rm -f $$tmpdir/$$lang.new.po; \
|
|
||||||
else \
|
|
||||||
if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
|
|
||||||
:; \
|
|
||||||
else \
|
|
||||||
echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
|
|
||||||
rm -f $$tmpdir/$$lang.new.po; \
|
|
||||||
exit 1; \
|
|
||||||
fi; \
|
|
||||||
fi; \
|
|
||||||
else \
|
|
||||||
echo "msgmerge for $$cat failed!"; \
|
|
||||||
rm -f $$tmpdir/$$lang.new.po; \
|
|
||||||
fi; \
|
|
||||||
done
|
|
||||||
|
|
||||||
# POTFILES is created from POTFILES.in by stripping comments, empty lines
|
|
||||||
# and Intltool tags (enclosed in square brackets), and appending a full
|
|
||||||
# relative path to them
|
|
||||||
POTFILES: POTFILES.in
|
|
||||||
( if test 'x$(srcdir)' != 'x.'; then \
|
|
||||||
posrcprefix='$(top_srcdir)/'; \
|
|
||||||
else \
|
|
||||||
posrcprefix="../"; \
|
|
||||||
fi; \
|
|
||||||
rm -f $@-t $@ \
|
|
||||||
&& (sed -e '/^#/d' \
|
|
||||||
-e "s/^\[.*\] +//" \
|
|
||||||
-e '/^[ ]*$$/d' \
|
|
||||||
-e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \
|
|
||||||
| sed -e '$$s/\\$$//') > $@-t \
|
|
||||||
&& chmod a-w $@-t \
|
|
||||||
&& mv $@-t $@ )
|
|
||||||
|
|
||||||
Makefile: Makefile.in.in ../config.status POTFILES
|
|
||||||
cd .. \
|
|
||||||
&& $(SHELL) ./config.status $(subdir)/$@.in
|
|
||||||
|
|
||||||
# Tell versions [3.59,3.63) of GNU make not to export all variables.
|
|
||||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
||||||
.NOEXPORT:
|
|
||||||
Loading…
Reference in New Issue
Block a user