Require intltool 0.40.0 and update intltool files

diff --git a/Makefile.am b/Makefile.am
index 846e0539bbdc923f834dd8e810da09f4806213e2..445af84942ded4cbf521a03f9f753ca2c71133ec 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 ## Created by Anjuta
 
-SUBDIRS = libchimara interpreters tests docs po player
+SUBDIRS = libchimara interpreters player tests docs po
 
 chimaradocdir = $(datadir)/doc/chimara
 dist_chimaradoc_DATA = \
@@ -14,11 +14,9 @@ dist_chimaradoc_DATA = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = chimara.pc chimara-plugin.pc
 
-EXTRA_DIST = intltool-extract.in intltool-merge.in intltool-update.in \
-       chimara.pc.in chimara-plugin.pc.in chimara.spec.in
+EXTRA_DIST = chimara.pc.in chimara-plugin.pc.in chimara.spec.in
 
-DISTCLEANFILES = chimara.pc chimara-plugin.pc chimara.spec \
-                                intltool-extract intltool-merge intltool-update
+DISTCLEANFILES = chimara.pc chimara-plugin.pc chimara.spec
 
 ACLOCAL_AMFLAGS = -I m4
 

diff --git a/autogen.sh b/autogen.sh
index 9c061ca5ad4610577fdd86ca71651548c4b0962a..6556cd8f3ddf8fa8566f68c8e5555746d0be96a3 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,8 +19,4 @@ autoreconf --force --install || exit 1
 # Run after autopoint
 echo "Setting up Intltool"
 intltoolize --copy --force --automake || exit 1
-# Hack to get intltool 0.40.0 to work (Debian stable)
-touch intltool-extract.in
-touch intltool-merge.in
-touch intltool-update.in
 

diff --git a/configure.ac b/configure.ac
index ef5267aee82f48cbfcb810826b9777ff6022dceb..9b0ebb0f7c7c176a14819b74538f278493c93446 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,7 @@ LT_INIT                      # Libtool 2.2.6 and up
 #LT_PREREQ([2.2.6])          # ...goddamn Debian still has 1.5
 AC_PROG_LIBTOOL              # Old way of declaring Libtool
 AM_GNU_GETTEXT([external])   # Gettext, link to system libintl
-IT_PROG_INTLTOOL    # Intltool
+IT_PROG_INTLTOOL([0.40.0])   # Intltool
 PKG_PROG_PKG_CONFIG          # pkg_config
 GTK_DOC_CHECK($GTK_DOC_REQUIRED_VERSION) 
 # Other utilities used in this package's various make scripts