use upstream gettext

4 files changed, 95 insertions, 6 deletions

diff --git a/Makefile.am b/Makefile.am
index b58f307..a7a9031 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,10 +18,23 @@ MAINTAINERCLEANFILES = \
 	$(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
 	$(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
 	`find "$(srcdir)/m4" -type f -name "*.m4" -print` \
+	$(srcdir)/ABOUT-NLS \
 	$(srcdir)/INSTALL \
+	$(srcdir)/build-aux/config.rpath \
 	$(srcdir)/config.h.in~ \
 	$(srcdir)/configure \
 	$(srcdir)/gtk-doc.make \
+	$(srcdir)/po/Makefile.in.in \
+	$(srcdir)/po/Makevars.template \
+	$(srcdir)/po/Rules-quot \
+	$(srcdir)/po/boldquot.sed \
+	$(srcdir)/po/en@boldquot.header \
+	$(srcdir)/po/en@quot.header \
+	$(srcdir)/po/libwnck-3.0.pot \
+	$(srcdir)/po/insert-header.sin \
+	$(srcdir)/po/quot.sed \
+	$(srcdir)/po/remove-potcdate.sin \
+	$(srcdir)/po/stamp-po \
 	$(NULL)
 
 CHANGELOG_GIT_RANGE = LIBWNCK_2_26_1..
diff --git a/autogen.sh b/autogen.sh
index e927ec6..6f5ad11 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -23,9 +23,7 @@ fi
 
 set -x
 aclocal --install || exit 1
-glib-gettextize --force --copy || exit 1
 gtkdocize --copy || exit 1
-intltoolize --force --copy --automake || exit 1
 autoreconf --verbose --force --install -Wno-portability || exit 1
 { set +x; } 2>/dev/null
 
diff --git a/configure.ac b/configure.ac
index 973eeb2..e9348cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,6 +11,7 @@ AC_INIT([libwnck], [wnck_version],
 
 AX_IS_RELEASE([git-directory])
 
+AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS(config.h)
 
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar])
@@ -47,8 +48,6 @@ AC_SUBST(WNCK_MICRO_VERSION)
 LT_PREREQ([2.2.6])
 LT_INIT([dlopen disable-static])
 
-IT_PROG_INTLTOOL([0.40.6])
-
 AC_PROG_CC
 
 AX_COMPILER_FLAGS([WARN_CFLAGS], [WARN_LDFLAGS])
@@ -69,12 +68,13 @@ AC_ARG_ENABLE(tools,
               [enable_tools=yes])
 AM_CONDITIONAL(ENABLE_TOOLS, test "x$enable_tools" != "xno")
 
+AM_GNU_GETTEXT_VERSION([0.19.4])
+AM_GNU_GETTEXT([external])
+
 GETTEXT_PACKAGE=libwnck-3.0
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Package name])
 
-AM_GLIB_GNU_GETTEXT
-
 # AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME
 # this is the directory where the *.{mo,gmo} files are installed
 wncklocaledir='${prefix}/${DATADIRNAME}/locale'
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..7b9b017
--- /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 = libwnck-3.0
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --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 = 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 = 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