[phodav] build-sys: remove intltool usage

From: Marc-André Lureau <malureau src gnome org>
To: commits-list gnome org
Cc:
Subject: [phodav] build-sys: remove intltool usage
Date: Fri, 22 Feb 2019 11:17:33 +0000 (UTC)
commit 2ffaf680ae04c941d8b396ae3f0941822fe1ad4a
Author: Marc-André Lureau <marcandre lureau redhat com>
Date:   Fri Feb 22 12:10:30 2019 +0100

    build-sys: remove intltool usage
    
    Signed-off-by: Marc-André Lureau <marcandre lureau redhat com>

 Makefile.am    |  3 +-
 autogen.sh     |  1 -
 configure.ac   |  6 ++--
 po/LINGUAS     |  1 -
 po/Makevars    | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/POTFILES.in |  1 -
 6 files changed, 99 insertions(+), 7 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b9f781b..b71c52d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -178,8 +178,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
 DISTCLEANFILES =       \
        gtk-doc.make    \
-       m4/gtk-doc.m4   \
-       m4/intltool.m4
+       m4/gtk-doc.m4
 
 MAINTAINERCLEANFILES =                                 \
        $(srcdir)/gtk-doc.make                          \
diff --git a/autogen.sh b/autogen.sh
index fd35663..9d394bf 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -24,7 +24,6 @@ fi
 
 aclocal --install || exit 1
 gtkdocize --copy || exit 1
-intltoolize --force --copy --automake || exit 1
 autoreconf --verbose --force --install || exit 1
 
 cd "$olddir"
diff --git a/configure.ac b/configure.ac
index 6c5b364..90f6eb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,12 @@
 AC_PREREQ([2.59])
 AC_INIT([phodav], [m4_esyscmd(build-aux/git-version-gen .tarball-version)],
-                  [https://bugzilla.gnome.org/enter_bug.cgi?product=phodav])
+                  [https://gitlab.gnome.org/GNOME/phodav/issues/new])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CANONICAL_HOST
 AC_PROG_CC
+AC_USE_SYSTEM_EXTENSIONS
 
 AC_CHECK_PROG([STOW], [stow], [yes], [no])
 AS_IF([test "x$STOW" = "xyes" && test -d /usr/local/stow], [
@@ -58,7 +59,8 @@ gl_WARN_ADD([-Wno-missing-field-initializers])
 GETTEXT_PACKAGE=phodav-2.0
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define to the Gettext package name])
 AC_SUBST(GETTEXT_PACKAGE)
-IT_PROG_INTLTOOL([0.40.0])
+AM_GNU_GETTEXT_VERSION([0.19.7])
+AM_GNU_GETTEXT([external])
 
 AC_CHECK_HEADERS([attr/xattr.h])
 
diff --git a/po/LINGUAS b/po/LINGUAS
index 8d5bd8a..e438373 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -16,6 +16,5 @@ ro
 sl
 sr
 sr@latin
-sl
 sv
 tr
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..229fd33
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,94 @@
+# 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_ \
+        --keyword=C_:1c,2 --keyword=NC_:1c,2 \
+        --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
+
+# 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 = Copyright (C) Red Hat, 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 = no
+
+# 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 = https://gitlab.gnome.org/GNOME/phodav/issues/new
+
+# 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 = no
+
+# 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
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d1e96d4..3f866ad 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,2 +1 @@
-[encoding: UTF-8]
 libphodav/chezdav.c
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]