aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd@luon.net>2012-03-12 06:47:59 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2012-03-12 16:44:24 +0800
commit96b027be0450a7e30173c45b44f81e62662fcf14 (patch)
tree74d5d0b607e75d81ebd4a043a4c5ac363c274428
parent8b88ebc132dc9c026d3beb377a20616c8ec81021 (diff)
downloadgsoc2013-empathy-96b027be0450a7e30173c45b44f81e62662fcf14.tar
gsoc2013-empathy-96b027be0450a7e30173c45b44f81e62662fcf14.tar.gz
gsoc2013-empathy-96b027be0450a7e30173c45b44f81e62662fcf14.tar.bz2
gsoc2013-empathy-96b027be0450a7e30173c45b44f81e62662fcf14.tar.lz
gsoc2013-empathy-96b027be0450a7e30173c45b44f81e62662fcf14.tar.xz
gsoc2013-empathy-96b027be0450a7e30173c45b44f81e62662fcf14.tar.zst
gsoc2013-empathy-96b027be0450a7e30173c45b44f81e62662fcf14.zip
Don't use both AM_GNU_GETTEXT and IT_PROG_INTLTOOL
When using IT_PROG_INTLTOOL using the gettect automake macros isn't necessary. To make matters worse, when mixing the marcos both try to generate po/Makefile.in.in. Recent versions of intltool detect when gettext won and bails when building.
-rw-r--r--configure.ac3
1 files changed, 0 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 3a0c72ddf..02e4dc5ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -293,9 +293,6 @@ fi
# -----------------------------------------------------------
IT_PROG_INTLTOOL([0.40.0])
-AM_GNU_GETTEXT_VERSION([0.17])
-AM_GNU_GETTEXT([external])
-
GETTEXT_PACKAGE=empathy
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name])