[template-glib] build: Use upstream gettext macros
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [template-glib] build: Use upstream gettext macros
- Date: Mon, 11 Jan 2016 21:08:56 +0000 (UTC)
commit 40e262756ae2d8c2178e5ad3d52073f6f3ade2df
Author: Patrick Griffis <tingping tingping se>
Date: Mon Jan 11 13:16:04 2016 -0500
build: Use upstream gettext macros
Makefile.am | 14 +-------------
autogen.sh | 2 --
configure.ac | 4 ++--
po/Makevars | 6 ++++++
4 files changed, 9 insertions(+), 17 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index c4234c6..b27de56 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,22 +1,9 @@
SUBDIRS = data src tests po doc examples
-INTLTOOL_FILES = \
- intltool-extract.in \
- intltool-merge.in \
- intltool-update.in \
- $(NULL)
-
EXTRA_DIST = \
- $(INTLTOOL_FILES) \
AUTHORS \
$(NULL)
-DISTCLEANFILES = \
- intltool-extract \
- intltool-merge \
- intltool-update \
- po/.intltool-merge-cache
-
DISTCHECK_CONFIGURE_FLAGS = \
--enable-introspection \
--enable-gtk-doc \
@@ -33,6 +20,7 @@ GITIGNOREFILES = \
gtk-doc.m4 \
gtk-doc.make \
INSTALL \
+ ABOUT-NLS \
$(NULL)
AUTHORS:
diff --git a/autogen.sh b/autogen.sh
index 1138865..da7cec5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,8 +15,6 @@ touch ChangeLog
touch INSTALL
aclocal --install -I build-aux || exit 1
-glib-gettextize --force --copy || exit 1
-intltoolize --force --copy --automake || exit 1
gtkdocize || exit 1
autoreconf --force --install -Wno-portability || exit 1
diff --git a/configure.ac b/configure.ac
index 3e7faa0..dbf2b2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,11 +49,11 @@ AM_MAINTAINER_MODE([enable])
dnl ***********************************************************************
dnl Internationalization
dnl ***********************************************************************
-IT_PROG_INTLTOOL([0.50.1])
GETTEXT_PACKAGE=AC_PACKAGE_TARNAME
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [GETTEXT package name])
-AM_GLIB_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([0.19.2])
+AM_GNU_GETTEXT([external])
dnl ***********************************************************************
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..5a893dd
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,6 @@
+top_builddir = ..
+subdir = po
+
+DOMAIN = $(PACKAGE)
+MSGMERGE_OPTIONS = --quiet
+DIST_DEPENDS_ON_UPDATE_PO = no
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]