[passepartout] support intltool 0.37.1 and 0.40.0



commit 88be5f820a8feb9f247690c9a42ae606d35c81ee
Author: Sven Herzberg <herzi lanedo com>
Date:   Wed Apr 15 11:47:05 2009 +0200

    support intltool 0.37.1 and 0.40.0
    
    * configure.ac: make sure we have at least intltool 0.37.1 (Ubuntu 8.04 LTS),
      but also work with 0.40.0 (Debian 5.0 Etch) - the new one doesn't create
      intltool scripts for the tarball
---
 Makefile.am  |   14 +++++++++++---
 configure.ac |    4 +++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index dc2230a..b1cd2ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,14 +38,22 @@ update-databases:
 install-data-local: update-databases
 uninstall-local: update-databases
 
+if DIST_INTLTOOL
 intltool_in_files=\
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in \
 	$(NULL)
-
-EXTRA_DIST=Doxyfile $(applications_in_files) $(intltool_in_files) po/ChangeLog
-CLEANFILES=$(applications_DATA)
+endif
+
+EXTRA_DIST=\
+	Doxyfile \
+	po/ChangeLog \
+	$(applications_in_files) \
+	$(intltool_in_files) \
+	$(mime_in_files) \
+	$(NULL)
+CLEANFILES=$(applications_DATA) $(mime_DATA)
 DISTCLEANFILES=$(intltool_in_files:.in=)
 
 # AM_GLIB_GNU_GETTEXT requires a ChangeLog for "dist"
diff --git a/configure.ac b/configure.ac
index 931da32..cda4253 100644
--- a/configure.ac
+++ b/configure.ac
@@ -118,7 +118,9 @@ dnl  ------
 dnl | i18n |
 dnl  ------
 
-IT_PROG_INTLTOOL
+IT_PROG_INTLTOOL([0.37.1])
+dnl intltool 0.40.0 doesn't create the intltool-*.in files anymore
+AM_CONDITIONAL(DIST_INTLTOOL,[test "$INTLTOOL_APPLIED_VERSION_AS_INT" -lt 4000])
 AM_GLIB_GNU_GETTEXT
 
 GETTEXT_PACKAGE="passepartout"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]