intltool r755 - trunk

[dobey svn gnome org]

Author: dobey
Date: Sun Jul 27 03:34:16 2008
New Revision: 755
URL: http://svn.gnome.org/viewvc/intltool?rev=755&view=rev

Log:
2008-07-27  Rodney Dawes  <dobey pwns gmail com>

	* intltool.m4 (IT_PROG_INTLTOOL):
	Require the AM_NLS macro, so USE_NLS gets defined
	Add a check for gmsgfmt that falls back to $MSGFMT
	This change removes the need for using AM_GLIB_GNU_GETTEXT or
	AM_GNU_GETTEXT for some projects.



Modified:
   trunk/ChangeLog
   trunk/intltool.m4

Modified: trunk/intltool.m4
==============================================================================
--- trunk/intltool.m4	(original)
+++ trunk/intltool.m4	Sun Jul 27 03:34:16 2008
@@ -24,8 +24,9 @@
 
 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
 # serial 40 IT_PROG_INTLTOOL
-AC_DEFUN([IT_PROG_INTLTOOL],
-[AC_PREREQ([2.50])dnl
+AC_DEFUN([IT_PROG_INTLTOOL], [
+AC_PREREQ([2.50])dnl
+AC_REQUIRE([AM_NLS])dnl
 
 case "$am__api_version" in
     1.[01234])
@@ -98,6 +99,7 @@
 AC_PATH_PROG(XGETTEXT, xgettext)
 AC_PATH_PROG(MSGMERGE, msgmerge)
 AC_PATH_PROG(MSGFMT, msgfmt)
+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
 if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
     AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
 fi
@@ -177,22 +179,17 @@
 	'"s|^|	$ac_top_srcdir/|" \
       "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
     ]
-    if test ! -f "$1/Makefile"; then
-      AC_MSG_ERROR([$1/Makefile is not ready.])
-    fi
-    mv "$1/Makefile" "$1/Makefile.tmp"
     [sed '/^POTFILES =/,/[^\\]$/ {
 		/^POTFILES =/!d
 		r $1/POTFILES
 	  }
-	 ' "$1/Makefile.tmp" >"$1/Makefile"]
+	 ' "$1/Makefile.in" >"$1/Makefile"]
     rm -f "$1/Makefile.tmp"
     mv "$1/stamp-it.tmp" "$1/stamp-it"
   ])
 ])dnl
 ])
 
-
 # deprecated macros
 AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
 # A hint is needed for aclocal from Automake <= 1.9.4: