intltoolize: problem building CVS

[Vance Shipley <vances motivity ca>]

I'm getting stuck building dia from CVS on intltoolize.  Any help 
would be appreciated.  This is under FreeBSD 4.6-PRERELEASE with
autoconf-2.53, automake-1.5, gettext-0.11.2 & intltool-0.22.

        -Vance

echo "Running intltoolize"
intltoolize --copy --force --automake
vances mobility$ intltoolize --copy --force --automake
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- Makefile.in.in.clean       Tue Apr 17 23:56:23 2001
|+++ Makefile.in.in     Sat Apr 28 17:58:22 2001
--------------------------
Patching file po/Makefile.in.in using Plan A...
Hunk #1 failed at 34.
Hunk #2 failed at 86.
Hunk #3 failed at 171.
3 out of 3 hunks failed--saving rejects to po/Makefile.in.in.rej
Hmm...  Ignoring the trailing garbage.
done


The contents of po/Makefile.in.in.rej are:

***************
*** 34,40 ****
  GMSGFMT = @GMSGFMT@
  MSGFMT = @MSGFMT@
  XGETTEXT = @XGETTEXT@
- MSGMERGE = msgmerge
  
  DEFS = @DEFS@
  CFLAGS = @CFLAGS@
--- 34,45 ----
  GMSGFMT = @GMSGFMT@
  MSGFMT = @MSGFMT@
  XGETTEXT = @XGETTEXT@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+ 
+ MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --dist
+ GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --pot
+ 
  
  DEFS = @DEFS@
  CFLAGS = @CFLAGS@

... (trimmed)


I can see that po/Makefile.in.in is a bit different:

GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@
MSGMERGE = msgmerge
MSGMERGE_UPDATE = @MSGMERGE@ --update
MSGINIT = msginit
MSGCONV = msgconv
MSGFILTER = msgfilter