conduit r1818 - in trunk: . m4

[jstowers svn gnome org]

Author: jstowers
Date: Tue Jan 20 01:45:11 2009
New Revision: 1818
URL: http://svn.gnome.org/viewvc/conduit?rev=1818&view=rev

Log:
2009-01-20  John Stowers  <john stowers gmail com>

	* configure.ac: Now that HEAD uses GIO by default, it
	makes sense to check for it in configure.
	Fixes #561554 (Tom Parker)



Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/m4/intltool.m4

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Jan 20 01:45:11 2009
@@ -31,6 +31,7 @@
 AM_CHECK_PYMOD([dateutil], , , AC_MSG_ERROR([Python module dateutil required to run Conduit]))
 AM_CHECK_PYMOD_VERSION([goocanvas], [pygoocanvas_version], [0.9.0], , AC_MSG_ERROR([Python module goocanvas >= 0.9.0 required to run Conduit]))
 AM_CHECK_PYMOD_VERSION([dbus], [__version__], [0.80.0], , AC_MSG_ERROR([Python module dbus >= 0.80.0 required to run Conduit]))
+AM_CHECK_PYMOD([gio], , , AC_MSG_ERROR([Python module gio required to run Conduit]))
 
 ################################################################################
 # DBus

Modified: trunk/m4/intltool.m4
==============================================================================
--- trunk/m4/intltool.m4	(original)
+++ trunk/m4/intltool.m4	Tue Jan 20 01:45:11 2009
@@ -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