Backporting once again from the trunk.

I18ners please double check (except Tokio).  It's always so painful to
resolve conflicts here, I hope I got them right.

2 files changed, 10 insertions, 8 deletions

diff --git a/configure b/configure
index 0b6575d5..841494e4 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 2.39 
+# From configure.in Revision: 2.39.2.1 
 
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.13 
@@ -668,9 +668,9 @@ except ImportError:
     res = "no"
 else:
     try:
-	distutils.sysconfig.get_config_vars()
+        distutils.sysconfig.get_config_vars()
     except distutils.errors.DistutilsPlatformError:
-	res = "no"
+        res = "no"
     else:
         res = "yes"
 fp = open("conftest.out", "w")
@@ -2086,6 +2086,7 @@ build/bin/list_members:bin/list_members \
 build/bin/list_owners:bin/list_owners \
 build/bin/mailmanctl:bin/mailmanctl \
 build/bin/mmsitepass:bin/mmsitepass \
+build/bin/msgfmt.py:bin/msgfmt.py \
 build/bin/newlist:bin/newlist \
 build/bin/pygettext.py:bin/pygettext.py \
 build/bin/qrunner:bin/qrunner \
diff --git a/configure.in b/configure.in
index 143315c5..06035b27 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -15,7 +15,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 6353 $)
+AC_REVISION($Revision: 6389 $)
 AC_PREREQ(2.0)
 AC_INIT(src/common.h)
 
@@ -97,9 +97,9 @@ except ImportError:
     res = "no"
 else:
     try:
-	distutils.sysconfig.get_config_vars()
+        distutils.sysconfig.get_config_vars()
     except distutils.errors.DistutilsPlatformError:
-	res = "no"
+        res = "no"
     else:
         res = "yes"
 fp = open("conftest.out", "w")
@@ -562,6 +562,7 @@ bin/list_members \
 bin/list_owners \
 bin/mailmanctl \
 bin/mmsitepass \
+bin/msgfmt.py \
 bin/newlist \
 bin/pygettext.py \
 bin/qrunner \
@@ -616,7 +617,7 @@ AC_OUTPUT([misc/paths.py Mailman/Defaults.py Mailman/mm_cfg.py.dist
            cron/crontab.in misc/mailman Makefile
            tests/Makefile tests/bounces/Makefile tests/msgs/Makefile
            $SCRIPTS],
-	echo "configuration completed at" `date`)
+        echo "configuration completed at" `date`)
 
 # Make sure all the build scripts are executable.
 chmod -R +x build