[msitools] build-sys: modernize gettext

[Marc-Andre Lureau <malureau src gnome org>]

commit 6438160f03fb665cf21e1c6669b4b4e4fdb3e6d7
Author: Marc-André Lureau <marcandre lureau redhat com>
Date:   Thu Jun 1 18:13:09 2017 +0400

    build-sys: modernize gettext

 Makefile.am         |    2 +-
 autogen.sh          |    2 +-
 configure.ac        |   12 +++-----
 include/Makefile.am |    2 +-
 po/Makevars         |   76 +++++++++++++++++++++++++++++++++++++++++++++++++++
 po/POTFILES.in      |    1 -
 6 files changed, 84 insertions(+), 11 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8d2eb44..0685e3b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -217,7 +217,7 @@ MAINTAINERCLEANFILES +=                                     \
        $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL)      \
        $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN)   \
        $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL)    \
-       m4/intltool.m4                                  \
+       $(GITIGNORE_MAINTAINERCLEANFILES_M4_GETTEXT)    \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/autogen.sh b/autogen.sh
index d85334b..f160862 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,6 +5,6 @@ test -n "$srcdir" || srcdir=.
 (
   cd "$srcdir" &&
   mkdir -p m4 &&
-  AUTOPOINT='intltoolize --automake --copy' autoreconf -fiv -Wall
+  autoreconf -fiv -Wall
 ) || exit
 test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
diff --git a/configure.ac b/configure.ac
index 359f458..6ff65d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,9 +18,7 @@ AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_CC
 AC_PROG_YACC
 
-IT_PROG_INTLTOOL([0.35])
-
-AM_PATH_GLIB_2_0([2.12.0])
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.12])
 PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 gio-2.0 >= 2.14])
 PKG_CHECK_MODULES([GSF], [libgsf-1])
 PKG_CHECK_MODULES([UUID], [uuid >= 1.41.3])
@@ -39,11 +37,11 @@ PKG_CHECK_MODULES([WIXL], [gio-2.0 >= 0.23.0
                            uuid >= 1.41.3
                            libxml-2.0 >= 2.7])
 
-GETTEXT_PACKAGE=msitools
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext Package])
+GETTEXT_PACKAGE=AC_PACKAGE_TARNAME
 AC_SUBST(GETTEXT_PACKAGE)
-AM_GNU_GETTEXT_VERSION([0.18])
-AM_GLIB_GNU_GETTEXT
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext Package])
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT([external])
 
 gl_MANYWARN_ALL_GCC([warnings])
 nw=
diff --git a/include/Makefile.am b/include/Makefile.am
index a2a450f..2acb687 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -8,7 +8,7 @@ ENUMS =                                         \
        $(NULL)
 
 $(ENUMS): %: %.etemplate $(ENUMS_FILES)
-       $(AM_V_GEN)$(GLIB_MKENUMS) --template $^ > $@
+       $(AM_V_GEN)glib-mkenums --template $^ > $@
 
 BUILT_SOURCES = $(ENUMS)
 
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..df15f4a
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,76 @@
+# 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 = 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 = 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 =
+
+# 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 =
+
+# Ignore the timestamp of the .pot file, as git clones do not have
+# deterministic timestamps, and .po files are updated by translators
+# (only) in GNOME projects.
+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 = no
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6e4655a..d1be0e4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,3 @@
-[encoding: UTF-8]
 tools/msiextract.vala
 tools/wixl/builder.vala
 tools/wixl/wixl-heat.vala