intltool r762 - trunk

[dobey svn gnome org]

Author: dobey
Date: Mon Oct  6 17:16:05 2008
New Revision: 762
URL: http://svn.gnome.org/viewvc/intltool?rev=762&view=rev

Log:
2008-10-06  Rodney Dawes  <dobey pwns gmail com>

	* intltool.m4 (IT_PO_SUBDIR):
	Check that Makefile.in came from a Makefile.in.in from intltool

	Fixes #554280



Modified:
   trunk/ChangeLog
   trunk/intltool.m4

Modified: trunk/intltool.m4
==============================================================================
--- trunk/intltool.m4	(original)
+++ trunk/intltool.m4	Mon Oct  6 17:16:05 2008
@@ -171,6 +171,9 @@
 dnl of config.status.
 AC_CONFIG_COMMANDS_PRE([
   AC_CONFIG_COMMANDS([$1/stamp-it], [
+    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then
+       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
+    fi
     rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
     >"$1/stamp-it.tmp"
     [sed '/^#/d