Mailman/pythonlib no longer "exists".

Also, add Ben Gertzfield's patch to produce warnings if the Japanese
and Chinese codecs aren't found.

2 files changed, 111 insertions, 5 deletions

diff --git a/configure b/configure
index a6d2e5a87..d7a02e850 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 2.18 
+# From configure.in Revision: 2.19 
 
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.13 
@@ -2140,7 +2140,7 @@ ac_given_INSTALL="$INSTALL"
 trap 'rm -fr `echo "misc/paths.py Mailman/Defaults.py Mailman/mm_cfg.py.dist
            src/Makefile misc/Makefile bin/Makefile
 	   Mailman/Makefile Mailman/Cgi/Makefile Mailman/Logging/Makefile
-	   Mailman/Archiver/Makefile Mailman/pythonlib/Makefile
+	   Mailman/Archiver/Makefile
 	   Mailman/Handlers/Makefile Mailman/Bouncers/Makefile
 	   Mailman/Queue/Makefile Mailman/MTA/Makefile Mailman/Gui/Makefile
 	   templates/Makefile cron/Makefile scripts/Makefile messages/Makefile
@@ -2241,7 +2241,7 @@ cat >> $CONFIG_STATUS <<EOF
 CONFIG_FILES=\${CONFIG_FILES-"misc/paths.py Mailman/Defaults.py Mailman/mm_cfg.py.dist
            src/Makefile misc/Makefile bin/Makefile
 	   Mailman/Makefile Mailman/Cgi/Makefile Mailman/Logging/Makefile
-	   Mailman/Archiver/Makefile Mailman/pythonlib/Makefile
+	   Mailman/Archiver/Makefile
 	   Mailman/Handlers/Makefile Mailman/Bouncers/Makefile
 	   Mailman/Queue/Makefile Mailman/MTA/Makefile Mailman/Gui/Makefile
 	   templates/Makefile cron/Makefile scripts/Makefile messages/Makefile
@@ -2321,3 +2321,57 @@ test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
 # Make sure all the build scripts are executable.
 chmod -R +x build
+
+# Test for the Japanese codecs.
+echo $ac_n "checking for Python Japanese Unicode codecs""... $ac_c" 1>&6
+echo "configure:2328: checking for Python Japanese Unicode codecs" >&5
+cat > conftest.py <<EOF
+try:
+  unicode("abc", "japanese.euc-jp")
+  print "found"
+except LookupError:
+  print "not found"
+EOF
+japanese=`$PYTHON conftest.py 2>/dev/null`
+rm -f conftest.py
+echo "$ac_t""$japanese" 1>&6
+if test "x$japanese" != "xfound"
+then
+    echo "configure: warning: 
+
+***** Python Unicode codecs for Japanese not found.
+***** Japanese emails generated by or manipulated in Mailman will not
+***** be sent in the correct character set and will be unreadable.
+***** Please uncompress and install the Japanese codecs from:
+***** http://pseudo.grad.sccs.chukyo-u.ac.jp/~kajiyama/python/
+*****
+***** Note: Everything else will work just fine.
+" 1>&2
+fi
+
+# Test for the Chinese codecs.
+echo $ac_n "checking for Python Chinese Unicode codecs""... $ac_c" 1>&6
+echo "configure:2355: checking for Python Chinese Unicode codecs" >&5
+cat > conftest.py <<EOF
+try:
+  unicode("abc", "big5-tw")
+  print "found"
+except LookupError:
+  print "not found"
+EOF
+chinese=`$PYTHON conftest.py 2>/dev/null`
+rm -f conftest.py
+echo "$ac_t""$chinese" 1>&6
+if test "x$chinese" != "xfound"
+then
+    echo "configure: warning: 
+
+***** Python Unicode codecs for Chinese not found.
+***** Chinese emails generated by or manipulated in Mailman will not
+***** be sent in the correct encoding and may be unreadable.
+***** Please uncompress and install the Chinese codecs from:
+***** http://sourceforge.net/projects/python-codecs/
+*****
+***** Note: Everything else will work just fine.
+" 1>&2
+fi
diff --git a/configure.in b/configure.in
index 3fe9d6a00..f8bb526cd 100644
--- a/configure.in
+++ b/configure.in
@@ -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: 4623 $)
+AC_REVISION($Revision: 4735 $)
 AC_PREREQ(2.0)
 AC_INIT(src/alias-wrapper.c)
 
@@ -529,7 +529,7 @@ dnl Output everything
 AC_OUTPUT([misc/paths.py Mailman/Defaults.py Mailman/mm_cfg.py.dist
            src/Makefile misc/Makefile bin/Makefile
 	   Mailman/Makefile Mailman/Cgi/Makefile Mailman/Logging/Makefile
-	   Mailman/Archiver/Makefile Mailman/pythonlib/Makefile
+	   Mailman/Archiver/Makefile
 	   Mailman/Handlers/Makefile Mailman/Bouncers/Makefile
 	   Mailman/Queue/Makefile Mailman/MTA/Makefile Mailman/Gui/Makefile
 	   templates/Makefile cron/Makefile scripts/Makefile messages/Makefile
@@ -539,3 +539,55 @@ AC_OUTPUT([misc/paths.py Mailman/Defaults.py Mailman/mm_cfg.py.dist
 
 # Make sure all the build scripts are executable.
 chmod -R +x build
+
+# Test for the Japanese codecs.
+AC_MSG_CHECKING(for Python Japanese Unicode codecs)
+cat > conftest.py <<EOF
+try:
+  unicode("abc", "japanese.euc-jp")
+  print "found"
+except LookupError:
+  print "not found"
+EOF
+japanese=`$PYTHON conftest.py 2>/dev/null`
+rm -f conftest.py
+AC_MSG_RESULT($japanese)
+if test "x$japanese" != "xfound"
+then
+    AC_MSG_WARN([
+
+***** Python Unicode codecs for Japanese not found.
+***** Japanese emails generated by or manipulated in Mailman will not
+***** be sent in the correct character set and will be unreadable.
+***** Please uncompress and install the Japanese codecs from:
+***** http://pseudo.grad.sccs.chukyo-u.ac.jp/~kajiyama/python/
+*****
+***** Note: Everything else will work just fine.
+])
+fi
+
+# Test for the Chinese codecs.
+AC_MSG_CHECKING(for Python Chinese Unicode codecs)
+cat > conftest.py <<EOF
+try:
+  unicode("abc", "big5-tw")
+  print "found"
+except LookupError:
+  print "not found"
+EOF
+chinese=`$PYTHON conftest.py 2>/dev/null`
+rm -f conftest.py
+AC_MSG_RESULT($chinese)
+if test "x$chinese" != "xfound"
+then
+    AC_MSG_WARN([
+
+***** Python Unicode codecs for Chinese not found.
+***** Chinese emails generated by or manipulated in Mailman will not
+***** be sent in the correct encoding and may be unreadable.
+***** Please uncompress and install the Chinese codecs from:
+***** http://sourceforge.net/projects/python-codecs/
+*****
+***** Note: Everything else will work just fine.
+])
+fi