[dasher] Import newer gconf-2.m4 before trying to fix it.

[Patrick Welche <pwelche src gnome org>]

commit d0813625304029eef447f69d3c8f3ca24a8d6e79
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Wed Dec 23 20:04:06 2009 +0000

    Import newer gconf-2.m4 before trying to fix it.

 ChangeLog     |   11 +++++++++++
 m4/README     |    2 +-
 m4/gconf-2.m4 |    5 +++--
 3 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a7c495d..43a1a2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-20  Patrick Welche <prlw1 cam ac uk>
+
+	* Import newer gconf-2.m4
+
+2009-12-18  Alan Lawrence <acl33 inf phy cam ac uk>
+
+	* Merge of branch allowing more natural way of switching
+	  alphabets, overflow fix, avoid reads of m_dCost after
+      potential deallocation, and actually make GetOffset do
+      something.
+
 2009-12-05  Alan Lawrence <acl33 inf phy cam ac uk>
 
 	* Avoid loading nonexistent training text
diff --git a/m4/README b/m4/README
index 24f0599..b87e7a8 100644
--- a/m4/README
+++ b/m4/README
@@ -1,6 +1,6 @@
 pkg.m4:                      pkg-config-0.23
 glib-gettext.m4:             glib of 2009-04-28 (2.20.1)
-gconf-2.m4:                  gconf-2.m4.in from gconf of 2009-04-28 (2.26.0)
+gconf-2.m4:                  gconf-2.m4.in from gconf of 2009-04-28 (git HEAD)
 gnome-doc-utils.m4:          gnome-doc-utils of 2009-04-28 (0.16.1)
 intltool.m4:                 intltool-0.40.6
 nls.m4:                      gettext of 2009-04-28 (0.18)
diff --git a/m4/gconf-2.m4 b/m4/gconf-2.m4
index 12c6bb6..4a0936e 100644
--- a/m4/gconf-2.m4
+++ b/m4/gconf-2.m4
@@ -34,10 +34,11 @@ AC_DEFUN([AM_GCONF_SOURCE_2],
   AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
 
   AC_ARG_ENABLE(schemas-install,
-     [  --disable-schemas-install	Disable the schemas installation],
+  	AC_HELP_STRING([--disable-schemas-install],
+		       [Disable the schemas installation]),
      [case ${enableval} in
        yes|no) ;;
-       *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
+       *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
       esac])
   AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
 ])