vte r2070 - trunk

[chpe svn gnome org]

Author: chpe
Date: Thu Jun 26 18:37:59 2008
New Revision: 2070
URL: http://svn.gnome.org/viewvc/vte?rev=2070&view=rev

Log:
Fix the Use of intltool 0.40.0.

Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/autogen.sh

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Thu Jun 26 18:37:59 2008
@@ -1,7 +1,6 @@
 SUBDIRS = src python termcaps po doc
-EXTRA_DIST = MAINTAINERS HACKING vte.pc.in vte-uninstalled.pc.in \
-	     intltool-extract.in intltool-merge.in intltool-update.in
-DISTCLEANFILES = intltool-extract intltool-merge intltool-update
+EXTRA_DIST = MAINTAINERS HACKING vte.pc.in vte-uninstalled.pc.in
+DISTCLEANFILES =
 
 if BUILD_GNOME_PTY_HELPER
 SUBDIRS += gnome-pty-helper

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Thu Jun 26 18:37:59 2008
@@ -4,8 +4,6 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-REQUIRED_AUTOMAKE_VERSION=1.8
-
 PKG_NAME="vte"
 
 (test -f $srcdir/configure.in \
@@ -20,4 +18,9 @@
     echo "You need to install gnome-common from the GNOME SVN"
     exit 1
 }
-USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
+
+USE_COMMON_DOC_BUILD=yes
+REQUIRED_AUTOMAKE_VERSION=1.9
+REQUIRED_INTLTOOL_VERSION=0.40.0
+
+. gnome-autogen.sh