[dasher] Move --enable-nls fix into configure.ac, as intltoolize replaces fixes in intltool.m4.

[Patrick Welche <pwelche src gnome org>]

commit f85c7df0ea0ba0c6948a6f8fce85286a147b3ecd
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Wed Feb 17 16:10:16 2010 +0000

    Move --enable-nls fix into configure.ac,
    as intltoolize replaces fixes in intltool.m4.

 ChangeLog                        |    5 +++++
 configure.ac                     |   10 ++++++++--
 m4/README                        |    4 ++--
 m4/{dintltool.m4 => intltool.m4} |    6 ------
 4 files changed, 15 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3c168a6..f5c0cf4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-17  Patrick Welche <prlw1 cam ac uk>
+
+	* Move --enable-nls fix into configure.ac, as intltoolize replaces
+	  fixes in intltool.m4.
+
 2009-02-16  Patrick Welche <prlw1 cam ac uk>
 
 	* Don't rename altered IT_PROG_INTLTOOL macro as gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index 02ec211..08d5c37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,8 +12,14 @@ AM_INIT_AUTOMAKE([1.8 gnu check-news dist-bzip2])
 AM_MAINTAINER_MODE
 
 AC_PROG_MAKE_SET
-IT_PROG_INTLTOOL([0.34.90])
-dnl IT_PROG_INTLTOOL([0.40.1])  c.f. bug #323968
+
+# IT_PROG_INTLTOOL requires AM_NLS but ignores --enable-nls
+AM_NLS
+AM_CONDITIONAL(USE_INTLTOOL, test "x$USE_NLS" = "xyes")
+AS_IF([test "x$USE_NLS" = "xyes"],[
+IT_PROG_INTLTOOL([0.34.90]) dnl IT_PROG_INTLTOOL([0.40.1])  c.f. bug #323968
+])
+
 
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
diff --git a/m4/README b/m4/README
index 3064dc3..d016356 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)
-dgconf-2.m4:                  modified gconf-2.m4.in from gconf of 2009-04-28 (git HEAD)
+dgconf-2.m4:                 modified 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)
-dintltool.m4:                modified intltool-0.40.6
+intltool.m4:                 intltool-0.40.6
 nls.m4:                      gettext of 2009-04-28 (0.18)
diff --git a/m4/dintltool.m4 b/m4/intltool.m4
similarity index 98%
rename from m4/dintltool.m4
rename to m4/intltool.m4
index c74c8ed..122d773 100644
--- a/m4/dintltool.m4
+++ b/m4/intltool.m4
@@ -22,17 +22,12 @@
 ## configuration script generated by Autoconf, you may include it under
 ## the same distribution terms that you use for the rest of that program.
 
-dnl THIS IS A MODIFIED VERSION OF intltool.m4
-
 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
 # serial 40 IT_PROG_INTLTOOL
 AC_DEFUN([IT_PROG_INTLTOOL], [
 AC_PREREQ([2.50])dnl
 AC_REQUIRE([AM_NLS])dnl
 
-AM_CONDITIONAL(USE_INTLTOOL, test $USE_NLS = yes)
-if test $USE_NLS = yes; then
-
 case "$am__api_version" in
     1.[01234])
 	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
@@ -166,7 +161,6 @@ AC_SUBST(DATADIRNAME)
 
 IT_PO_SUBDIR([po])
 
-fi # USE_NLS
 ])