[gegl] Migrated from intltool to GNU gettext.

[Øyvind Kolås <ok src gnome org>]

commit 37262520be05d3903d142c6cfe655bc727596ded
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Sun Oct 15 12:50:34 2017 +0200

    Migrated from intltool to GNU gettext.
    
    Signed-off-by: Niels De Graef <nielsdegraef gmail com>

 .gitignore        |    3 +-
 autogen.sh        |    7 --
 configure.ac      |    7 +-
 m4/.gitignore     |   32 ++++++++
 po/.gitignore     |   10 ++-
 po/Makefile.in.in |  225 -----------------------------------------------------
 po/Makevars       |   78 ++++++++++++++++++
 po/POTFILES.in    |    1 -
 8 files changed, 124 insertions(+), 239 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0fa1bd3..037113c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 /.cdtproject
 /.project
 /.tm_project.cache
+/ABOUT-NLS
 /ChangeLog
 /INSTALL
 /Makefile
@@ -19,6 +20,7 @@
 /config.h
 /config.h.in
 /config.log
+/config.rpath
 /config.status
 /config.sub
 /configure
@@ -47,4 +49,3 @@
 cscope.files
 cscope.out
 /*.project
-m4/intltool.m4
diff --git a/autogen.sh b/autogen.sh
index 1ac8758..55fae8c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,13 +21,6 @@ if test -z $AUTORECONF; then
         exit 1
 fi
 
-INTLTOOLIZE=`which intltoolize`
-if test -z $INTLTOOLIZE; then
-        echo "*** No intltoolize found, please install the intltool package ***"
-        exit 1
-fi
-
-intltoolize --automake --copy
 autoreconf --force --install --verbose
 
 cd $ORIGDIR
diff --git a/configure.ac b/configure.ac
index 25f412f..8025f89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -546,6 +546,9 @@ DEP_LIBS=`$PKG_CONFIG --libs $GLIB_PACKAGES gthread-2.0`
 # gettext i18n support
 ######################
 
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.19.8])
+
 GETTEXT_PACKAGE=gegl-$GEGL_API_VERSION
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
@@ -569,10 +572,6 @@ AC_CHECK_FUNCS(bind_textdomain_codeset,,
 ]))
 LIBS=$gegl_save_LIBS
 
-IT_PROG_INTLTOOL(0.40.1)
-
-AM_GLIB_GNU_GETTEXT
-
 
 ######################################
 # Checks for gtk-doc and docbook-tools
diff --git a/m4/.gitignore b/m4/.gitignore
index 38066dd..abd28ca 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,5 +1,37 @@
+codeset.m4
+extern-inline.m4
+fcntl-o.m4
+gettext.m4
+glibc2.m4
+glibc21.m4
+iconv.m4
+intdiv0.m4
+intl.m4
+intldir.m4
+intlmacosx.m4
+intmax.m4
+inttypes-pri.m4
+inttypes_h.m4
+lcmessage.m4
+lib-ld.m4
+lib-link.m4
+lib-prefix.m4
 libtool.m4
+lock.m4
+longlong.m4
 ltoptions.m4
 ltsugar.m4
 ltversion.m4
 lt~obsolete.m4
+nls.m4
+po.m4
+printf-posix.m4
+progtest.m4
+size_max.m4
+stdint_h.m4
+threadlib.m4
+uintmax_t.m4
+visibility.m4
+wchar_t.m4
+wint_t.m4
+xsize.m4
diff --git a/po/.gitignore b/po/.gitignore
index a9d7fba..1f44e1d 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -1,11 +1,19 @@
 /*.gmo
 /*.mo
 /*.pot
-/.intltool-merge-cache
 /Makefile
 /Makefile.in
+/Makefile.in.in
+/Makevars.template
 /POTFILES
+/Rules-quot
+/boldquot.sed
+/en@boldquot.header
+/en@quot.header
+/insert-header.sin
 /messages
 /missing
 /po2tbl.sed.in
+/quot.sed
+/remove-potcdate.sin
 /stamp-it
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..5d3a61e
--- /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_ --keyword=Q_:1g --keyword=C_:1c,2 --keyword=NC_:1c,2 
--from-code=UTF-8 --add-comments
+
+# 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 = (PACKAGE_STRING) authors
+
+# 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://bugzilla.gnome.org/enter_bug.cgi?product=GEGL&keywords=I18N+L10N&component=general
+
+# 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 = yes
+
+# 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 = no
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 623a40a..b8c3b29 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,5 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-[encoding: UTF-8]
 bin/gegl.c
 bin/gegl-options.c
 gegl/gegl-enums.c