From 2f2d1830385ba8fefd600f8393f86ec3bc867a25 Mon Sep 17 00:00:00 2001 From: fliep Date: Sat, 5 Dec 2009 00:11:45 +0000 Subject: [PATCH] Require intltool 0.40.0 and update intltool files --- Makefile.am | 8 +++----- autogen.sh | 4 ---- configure.ac | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index 846e053..445af84 100644 --- 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 9c061ca..6556cd8 100755 --- 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 ef5267a..9b0ebb0 100644 --- 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 -- 2.30.2