[dasher] * Make --disable-nls actually do something. * Rename gconf-2.m4 and intltool.m4 to make it obvious t

[Patrick Welche <pwelche src gnome org>]

commit 05c4ea98c6ec4765212d2a1652713d8015be5957
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Wed Jan 13 19:25:05 2010 +0000

    * Make --disable-nls actually do something.
    * Rename gconf-2.m4 and intltool.m4 to make it obvious that these
      aren't the originals.

 ChangeLog                        |    6 ++++++
 Data/Makefile.am                 |    5 +++++
 Makefile.am                      |    5 ++++-
 configure.ac                     |    4 ++--
 m4/Makefile.am                   |    1 -
 m4/README                        |    4 ++--
 m4/{gconf-2.m4 => dgconf-2.m4}   |    4 +++-
 m4/{intltool.m4 => dintltool.m4} |   10 ++++++++--
 8 files changed, 30 insertions(+), 9 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ff50b09..3376070 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-13  Patrick Welche <prlw1 cam ac uk>
+
+	* Rename gconf-2.m4 and intltool.m4 to make it obvious that
+	  these aren't the originals.
+	* Make --disable-nls actually do something.
+
 2009-01-13  Alan Lawrence <acl33 inf phy cam ac uk>
 
 	* iPhone: disable landscape mode when using tilt sensor to
diff --git a/Data/Makefile.am b/Data/Makefile.am
index 93fccc7..22d07c8 100644
--- a/Data/Makefile.am
+++ b/Data/Makefile.am
@@ -3,7 +3,12 @@ SUBDIRS =  training alphabets colours controllabels GUI Help
 desktopdir = $(datadir)/applications
 desktop_in_files = dasher.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+if USE_INTLTOOL
 @INTLTOOL_DESKTOP_RULE@
+else
+dasher.desktop:	dasher.desktop.in
+	cp dasher.desktop.in dasher.desktop
+endif
 
 icondir = $(datadir)/icons/hicolor/48x48/apps
 icon_DATA = dasher.png
diff --git a/Makefile.am b/Makefile.am
index b2ca966..9c24482 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,7 @@
-SUBDIRS = Src Data po Doc
+SUBDIRS = Src Data Doc
+if USE_INTLTOOL
+SUBDIRS += po
+endif
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/configure.ac b/configure.ac
index 19d9a1c..c98c3f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ AM_INIT_AUTOMAKE([1.8 gnu check-news dist-bzip2])
 AM_MAINTAINER_MODE
 
 AC_PROG_MAKE_SET
-IT_PROG_INTLTOOL([0.34.90])
+DIT_PROG_INTLTOOL([0.34.90])
 dnl IT_PROG_INTLTOOL([0.40.1])  c.f. bug #323968
 
 AC_DISABLE_STATIC
@@ -202,7 +202,7 @@ else
 	BUILDGTK2=false
 fi
 
-AM_GCONF_SOURCE_2
+DAM_GCONF_SOURCE_2
 if test x$BUILDGTK2 = xtrue
 then
 # GtkBuilder's autoconnect feature requires dasher to be linked with
diff --git a/m4/README b/m4/README
index b87e7a8..3064dc3 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 (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)
-intltool.m4:                 intltool-0.40.6
+dintltool.m4:                modified intltool-0.40.6
 nls.m4:                      gettext of 2009-04-28 (0.18)
diff --git a/m4/gconf-2.m4 b/m4/dgconf-2.m4
similarity index 95%
rename from m4/gconf-2.m4
rename to m4/dgconf-2.m4
index b6c4951..baa6406 100644
--- a/m4/gconf-2.m4
+++ b/m4/dgconf-2.m4
@@ -1,3 +1,5 @@
+dnl THIS IS A MODIFIED VERSION OF gconf-2.m4
+
 dnl AM_GCONF_SOURCE_2
 dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
 dnl  (i.e. pass to gconftool-2
@@ -5,7 +7,7 @@ dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
 dnl  you should install foo.schemas files
 dnl
 
-AC_DEFUN([AM_GCONF_SOURCE_2],
+AC_DEFUN([DAM_GCONF_SOURCE_2],
 [
   AC_CHECK_PROG([found_gconftool], [gconftool-2], [yes], [no])
   if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x" -a $found_gconftool = yes; then
diff --git a/m4/intltool.m4 b/m4/dintltool.m4
similarity index 98%
rename from m4/intltool.m4
rename to m4/dintltool.m4
index 122d773..001d2d5 100644
--- a/m4/intltool.m4
+++ b/m4/dintltool.m4
@@ -22,12 +22,17 @@
 ## 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], [
+# serial 40 DIT_PROG_INTLTOOL
+AC_DEFUN([DIT_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])
@@ -161,6 +166,7 @@ AC_SUBST(DATADIRNAME)
 
 IT_PO_SUBDIR([po])
 
+fi # USE_NLS
 ])