]> git.0d.be Git - empathy.git/commitdiff
Don't use both AM_GNU_GETTEXT and IT_PROG_INTLTOOL
authorSjoerd Simons <sjoerd@luon.net>
Sun, 11 Mar 2012 22:47:59 +0000 (23:47 +0100)
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>
Mon, 12 Mar 2012 08:44:24 +0000 (09:44 +0100)
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.

configure.ac

index 3a0c72ddf18e1a9b96ed19dd7cd67838d5e291a7..02e4dc5ffd31e03801d0244411b1441fc555f65f 100644 (file)
@@ -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])