Merge lp:~robert-ancell/intltool/remove-am-gnu-gettext into lp:intltool

[Robert Ancell]

[dobey (dobey)]

review: Approve

=== modified file 'doc/I18N-HOWTO'
--- doc/I18N-HOWTO	2008-07-23 14:25:20 +0000
+++ doc/I18N-HOWTO	2012-07-10 21:22:22 +0000
@@ -50,7 +50,7 @@
      AM_INIT_AUTOMAKE($PACKAGE, $VERSION) 
    to configure.in, just after AC_INIT
 
-   Change AC_CONFIG_HEADER to AM_CONFIG_HEADER as well.
+   Change AC_CONFIG_HEADERS to AM_CONFIG_HEADER as well.
 
    If you have an empty AC_CONFIG_FILES macro, then comment that, or automake
    will fail in the next step.
@@ -92,13 +92,7 @@
     The gettext macros need to be added after the initial checks.  
     Putting them after the checks for library functions is a good idea.
 
-    IT_PROG_INTLTOOL(0.26)
-
-    AM_GNU_GETTEXT([external])		# Only one of these two macro calls
-    AM_GLIB_GNU_GETTEXT			# is needed to set up your project
-
-    ALL_LINGUAS="da nl"                 # Internationalization, means there is 
-					# a .po file for danish and dutch.
+    IT_PROG_INTLTOOL(0.50.0)
 
     AC_OUTPUT(
 	Makefile
@@ -111,19 +105,6 @@
     Please require the latest intltool that exists. Intltool releases
     are pretty stable and often only contains bugfixes.
 
-    AM_GNU_GETTEXT adds native language support to automake, together
-    with a compile option.
-
-    AM_GNU_GETTEXT will check for additional required functions and
-    programs and will finally create po/POTFILES during configure.
-
-    Instead of AM_GNU_GETTEXT you can use AM_GLIB_GNU_GETTEXT, which
-    will do a few less things than AM_GNU_GETTEXT, but does more than
-    enough for what intltool needs to work.
-
-    You do NOT need to use both AM_GNU_GETTEXT and AM_GLIB_GNU_GETTEXT
-    together though. Only one of them will suffice.
-
     The text domain is identified by PACKAGE.  We will need to add a few
     functions later on to helloworld.c that will use this #define'd variable.
 
@@ -135,9 +116,6 @@
 
     da nl
 
-    NOTE: These used to be in configure.{in,ac} in the ALL_LINGUAS
-    variable. This is deprecated since gettext 0.11
-
 9.  Run 
        aclocal 
      to make sure that the necessary autoconf and automake macros