[at-spi2-core/wip/meson: 12/15] Drop intltool
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [at-spi2-core/wip/meson: 12/15] Drop intltool
- Date: Wed, 24 May 2017 13:19:46 +0000 (UTC)
commit 154ca0e62a4d8581b1a4bdf6fe556cd5e1e0aed8
Author: Emmanuele Bassi <ebassi gnome org>
Date: Wed May 24 14:00:26 2017 +0100
Drop intltool
We are not using any of its features, so we can simply use upstream
gettext.
autogen.sh | 2 -
configure.ac | 26 +++++++++++--------
po/Makevars | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 93 insertions(+), 13 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 38add59..4576400 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,8 +9,6 @@ cd "$srcdir"
# run gtkdocize
gtkdocize || exit 1
-intltoolize --force --copy --automake || exit 1
-
# gnome-autogen.sh runs configure, so do likewise.
autoreconf -vif
diff --git a/configure.ac b/configure.ac
index b871a34..c8ed740 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,19 +28,21 @@ AM_INIT_AUTOMAKE([1.9 -Wall foreign no-dist-gzip dist-xz])
AM_SILENT_RULES([yes])
AC_PROG_CC
-AM_PROG_AR
LT_INIT([disable-static])
PKG_PROG_PKG_CONFIG
AC_CONFIG_HEADERS([config.h])
-dnl translation of at-spi strings
-IT_PROG_INTLTOOL([0.40.0])
-
AC_PROG_SED
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT([external])
+
GETTEXT_PACKAGE="${PACKAGE}"
AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],
+ ["$GETTEXT_PACKAGE"],
+ [The prefix for our gettext translation domains.])
PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0])
AC_SUBST(DBUS_LIBS)
@@ -166,18 +168,20 @@ if test "x$GCC" = xyes; then
CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
fi
CPPFLAGS=$orig_CPPFLAGS
-AC_CONFIG_FILES([Makefile po/Makefile.in
+AC_CONFIG_FILES([
+ Makefile
+ po/Makefile.in
xml/Makefile
dbind/Makefile
atspi/Makefile
registryd/Makefile
bus/Makefile
-doc/Makefile
-doc/libatspi/Makefile
-doc/libatspi/version.xml
-test/Makefile
-atspi-2.pc
-atspi-2-uninstalled.pc
+ doc/Makefile
+ doc/libatspi/Makefile
+ doc/libatspi/version.xml
+ test/Makefile
+ atspi-2.pc
+ atspi-2-uninstalled.pc
])
AC_OUTPUT
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..0648ec7
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,78 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
+# package. (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.) Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright. The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty. If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU =
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+# in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+# understood.
+# - Strings which make invalid assumptions about notation of date, time or
+# money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used. It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context. Possible values are "yes" and "no". Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+# --previous to keep previous msgids of translated messages,
+# --quiet to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed. Possible values are "yes" and "no". Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = yes
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist". Possible values are "yes" and
+# "no". Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = yes
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]