gnome-web-photo r111 - trunk

[chpe svn gnome org]

Author: chpe
Date: Wed Jul  2 18:16:18 2008
New Revision: 111
URL: http://svn.gnome.org/viewvc/gnome-web-photo?rev=111&view=rev

Log:
Fix the build with intltool 0.40.

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

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Wed Jul  2 18:16:18 2008
@@ -4,19 +4,13 @@
 
 EXTRA_DIST = 			\
 	autogen.sh		\
-	intltool-merge.in	\
-	intltool-update.in	\
-	intltool-extract.in	\
 	ChangeLog		\
 	COPYING.README		\
 	COPYING.LGPL		\
 	HACKING			\
 	MAINTAINERS
 
-DISTCLEANFILES = 		\
-	intltool-extract 	\
-	intltool-merge 		\
-	intltool-update
+DISTCLEANFILES =
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --with-gecko=$(GECKO)
 

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Wed Jul  2 18:16:18 2008
@@ -17,4 +17,6 @@
     exit 1
 }
 
-REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh
+REQUIRED_AUTOMAKE_VERSION=1.9
+REQUIRED_INTLTOOL_VERSION=0.40.0
+. gnome-autogen.sh