Index: dia/dia-0.88.1/config.h.in
diff -u dia/dia-0.88.1/config.h.in:1.1.1.1 dia/dia-0.88.1/config.h.in:1.2
--- dia/dia-0.88.1/config.h.in:1.1.1.1	Mon Sep 24 10:42:06 2001
+++ dia/dia-0.88.1/config.h.in	Sun Sep 30 15:00:22 2001
@@ -59,6 +59,9 @@
 /* define to enable XIM support */
 #undef USE_XIM
 
+/* define to enable I18N support beyond Japanese localization */
+#undef USE_I18N
+
 /* Define if you have the __argz_count function.  */
 #undef HAVE___ARGZ_COUNT
 
Index: dia/dia-0.88.1/configure
diff -u dia/dia-0.88.1/configure:1.1.1.1 dia/dia-0.88.1/configure:1.2
--- dia/dia-0.88.1/configure:1.1.1.1	Mon Sep 24 10:42:06 2001
+++ dia/dia-0.88.1/configure	Sun Sep 30 15:00:22 2001
@@ -218,6 +218,8 @@
 ac_help="$ac_help
   --enable-debug=[no/minimum/yes] turn on debugging [default=minimum]"
 ac_help="$ac_help
+  --disable-i18n           disable i18n code"
+ac_help="$ac_help
   --disable-nls           do not use Native Language Support"
 ac_help="$ac_help
   --with-included-gettext use the GNU gettext library included here"
@@ -765,7 +767,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:769: checking for a BSD compatible install" >&5
+echo "configure:771: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -818,7 +820,7 @@
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:822: checking whether build environment is sane" >&5
+echo "configure:824: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftest.file
@@ -890,7 +892,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:894: checking for $ac_word" >&5
+echo "configure:896: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -920,7 +922,7 @@
 done
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:924: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:926: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1077,7 +1079,7 @@
 
 
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1081: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1083: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1126,7 +1128,7 @@
 
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1130: checking how to run the C preprocessor" >&5
+echo "configure:1132: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1141,13 +1143,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1145 "configure"
+#line 1147 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1158,13 +1160,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1162 "configure"
+#line 1164 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1175,13 +1177,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1179 "configure"
+#line 1181 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1213,7 +1215,7 @@
 END
 # If we don't find an include directive, just comment out the code.
 echo $ac_n "checking for style of include used by $am_make""... $ac_c" 1>&6
-echo "configure:1217: checking for style of include used by $am_make" >&5
+echo "configure:1219: checking for style of include used by $am_make" >&5
 _am_include='#'
 for am_inc in include .include; do
    echo "$am_inc confinc" > confmf
@@ -1227,12 +1229,12 @@
 rm -f confinc confmf
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:1231: checking for Cygwin environment" >&5
+echo "configure:1233: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1236 "configure"
+#line 1238 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1243,7 +1245,7 @@
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:1247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -1260,19 +1262,19 @@
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:1264: checking for mingw32 environment" >&5
+echo "configure:1266: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1269 "configure"
+#line 1271 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:1276: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1278: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -1341,7 +1343,7 @@
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1345: checking host system type" >&5
+echo "configure:1347: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -1362,7 +1364,7 @@
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1366: checking build system type" >&5
+echo "configure:1368: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -1382,7 +1384,7 @@
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1386: checking for $ac_word" >&5
+echo "configure:1388: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1412,7 +1414,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1416: checking for $ac_word" >&5
+echo "configure:1418: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1463,7 +1465,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1467: checking for $ac_word" >&5
+echo "configure:1469: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1495,7 +1497,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1499: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1501: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1506,12 +1508,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1510 "configure"
+#line 1512 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1537,12 +1539,12 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1541: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1543: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1546: checking whether we are using GNU C" >&5
+echo "configure:1548: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1551,7 +1553,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1570,7 +1572,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1574: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1576: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1607,7 +1609,7 @@
 
 
 echo $ac_n "checking dependency style of $depcc""... $ac_c" 1>&6
-echo "configure:1611: checking dependency style of $depcc" >&5
+echo "configure:1613: checking dependency style of $depcc" >&5
 if eval "test \"`echo '$''{'am_cv_CC_dependencies_compiler_type'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1680,7 +1682,7 @@
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1684: checking for ld used by GCC" >&5
+echo "configure:1686: checking for ld used by GCC" >&5
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1710,10 +1712,10 @@
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1714: checking for GNU ld" >&5
+echo "configure:1716: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1717: checking for non-GNU ld" >&5
+echo "configure:1719: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1748,7 +1750,7 @@
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1752: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1754: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1765,7 +1767,7 @@
 
 
 echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1769: checking for $LD option to reload object files" >&5
+echo "configure:1771: checking for $LD option to reload object files" >&5
 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1777,7 +1779,7 @@
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1781: checking for BSD-compatible nm" >&5
+echo "configure:1783: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1815,7 +1817,7 @@
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1819: checking whether ln -s works" >&5
+echo "configure:1821: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1836,7 +1838,7 @@
 fi
 
 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:1840: checking how to recognise dependant libraries" >&5
+echo "configure:1842: checking how to recognise dependant libraries" >&5
 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2009,13 +2011,13 @@
 deplibs_check_method=$lt_cv_deplibs_check_method
 
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2013: checking for object suffix" >&5
+echo "configure:2015: checking for object suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   rm -f conftest*
 echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   for ac_file in conftest.*; do
     case $ac_file in
     *.c) ;;
@@ -2035,7 +2037,7 @@
 
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:2039: checking for executable suffix" >&5
+echo "configure:2041: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2045,7 +2047,7 @@
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:2049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:2051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -2076,7 +2078,7 @@
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
 echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
-echo "configure:2080: checking command to parse $NM output" >&5
+echo "configure:2082: checking command to parse $NM output" >&5
 if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2152,10 +2154,10 @@
 int main(){nm_test_var='a';nm_test_func();return(0);}
 EOF
 
-  if { (eval echo configure:2156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo configure:2158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { (eval echo configure:2159: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
+    if { (eval echo configure:2161: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -2206,7 +2208,7 @@
 	  save_CFLAGS="$CFLAGS"
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$no_builtin_flag"
-	  if { (eval echo configure:2210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+	  if { (eval echo configure:2212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 	    pipe_works=yes
 	  fi
 	  LIBS="$save_LIBS"
@@ -2252,17 +2254,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2256: checking for $ac_hdr" >&5
+echo "configure:2258: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2261 "configure"
+#line 2263 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2266: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2297,7 +2299,7 @@
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2301: checking for ${ac_tool_prefix}file" >&5
+echo "configure:2303: checking for ${ac_tool_prefix}file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2359,7 +2361,7 @@
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2363: checking for file" >&5
+echo "configure:2365: checking for file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2430,7 +2432,7 @@
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2434: checking for $ac_word" >&5
+echo "configure:2436: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2462,7 +2464,7 @@
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2466: checking for $ac_word" >&5
+echo "configure:2468: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2497,7 +2499,7 @@
 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2501: checking for $ac_word" >&5
+echo "configure:2503: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2529,7 +2531,7 @@
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2533: checking for $ac_word" >&5
+echo "configure:2535: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2578,8 +2580,8 @@
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2582 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 2584 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:2585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -2600,7 +2602,7 @@
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2604: checking whether the C compiler needs -belf" >&5
+echo "configure:2606: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2613,14 +2615,14 @@
 cross_compiling=$ac_cv_prog_cc_cross
 
      cat > conftest.$ac_ext <<EOF
-#line 2617 "configure"
+#line 2619 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2733,7 +2735,7 @@
 compiler="$2"
 
 echo $ac_n "checking for objdir""... $ac_c" 1>&6
-echo "configure:2737: checking for objdir" >&5
+echo "configure:2739: checking for objdir" >&5
 rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
 if test -d .libs; then
@@ -2760,7 +2762,7 @@
 # in isolation, and that seeing it set (from the cache) indicates that
 # the associated values are set (in the cache) correctly too.
 echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
-echo "configure:2764: checking for $compiler option to produce PIC" >&5
+echo "configure:2766: checking for $compiler option to produce PIC" >&5
 if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2912,21 +2914,21 @@
 
   # Check to make sure the pic_flag actually works.
   echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6
-echo "configure:2916: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
+echo "configure:2918: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
   if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
       save_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
     cat > conftest.$ac_ext <<EOF
-#line 2923 "configure"
+#line 2925 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2930: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
         case $host_os in
       hpux9* | hpux10* | hpux11*)
@@ -2978,7 +2980,7 @@
 fi
 
 echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6
-echo "configure:2982: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
+echo "configure:2984: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
 if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2986,14 +2988,14 @@
   save_LDFLAGS="$LDFLAGS"
   LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
   cat > conftest.$ac_ext <<EOF
-#line 2990 "configure"
+#line 2992 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_prog_cc_static_works=yes
 else
@@ -3020,7 +3022,7 @@
 
 # Check to see if options -o and -c are simultaneously supported by compiler
 echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
-echo "configure:3024: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo "configure:3026: checking if $compiler supports -c -o file.$ac_objext" >&5
 if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3039,7 +3041,7 @@
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:3043: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:3045: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -3068,7 +3070,7 @@
 if test x"$compiler_c_o" = x"yes"; then
   # Check to see if we can write to a .lo
   echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6
-echo "configure:3072: checking if $compiler supports -c -o file.lo" >&5
+echo "configure:3074: checking if $compiler supports -c -o file.lo" >&5
   if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3077,14 +3079,14 @@
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -c -o conftest.lo"
   cat > conftest.$ac_ext <<EOF
-#line 3081 "configure"
+#line 3083 "configure"
 #include "confdefs.h"
 
 int main() {
 int some_variable = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:3088: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3090: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
       # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@@ -3114,7 +3116,7 @@
 if test "$compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
   echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
-echo "configure:3118: checking if we can lock with hard links" >&5
+echo "configure:3120: checking if we can lock with hard links" >&5
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -3133,20 +3135,20 @@
 if test "$GCC" = yes; then
   # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
   echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
-echo "configure:3137: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo "configure:3139: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
   echo "int some_variable = 0;" > conftest.$ac_ext
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
   compiler_rtti_exceptions=no
   cat > conftest.$ac_ext <<EOF
-#line 3143 "configure"
+#line 3145 "configure"
 #include "confdefs.h"
 
 int main() {
 int some_variable = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:3150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3152: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
       # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@@ -3173,7 +3175,7 @@
 
 # See if the linker supports building shared libraries.
 echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6
-echo "configure:3177: checking whether the linker ($LD) supports shared libraries" >&5
+echo "configure:3179: checking whether the linker ($LD) supports shared libraries" >&5
 
 allow_undefined_flag=
 no_undefined_flag=
@@ -3789,7 +3791,7 @@
 
 # Check hardcoding attributes.
 echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
-echo "configure:3793: checking how to hardcode library paths into programs" >&5
+echo "configure:3795: checking how to hardcode library paths into programs" >&5
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" || \
    test -n "$runpath_var"; then
@@ -3817,7 +3819,7 @@
 striplib=
 old_striplib=
 echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
-echo "configure:3821: checking whether stripping libraries is possible" >&5
+echo "configure:3823: checking whether stripping libraries is possible" >&5
 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
@@ -3831,7 +3833,7 @@
 
 # PORTME Fill in your ld.so characteristics
 echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
-echo "configure:3835: checking dynamic linker characteristics" >&5
+echo "configure:3837: checking dynamic linker characteristics" >&5
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -4217,7 +4219,7 @@
 
 # Report the final consequences.
 echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
-echo "configure:4221: checking if libtool supports shared libraries" >&5
+echo "configure:4223: checking if libtool supports shared libraries" >&5
 echo "$ac_t""$can_build_shared" 1>&6
 
 if test "$hardcode_action" = relink; then
@@ -4256,7 +4258,7 @@
 
   *)
     echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:4260: checking for dlopen in -ldl" >&5
+echo "configure:4262: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4264,7 +4266,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4268 "configure"
+#line 4270 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4275,7 +4277,7 @@
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:4279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4294,12 +4296,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "configure:4298: checking for dlopen" >&5
+echo "configure:4300: checking for dlopen" >&5
 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4303 "configure"
+#line 4305 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlopen(); below.  */
@@ -4322,7 +4324,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_dlopen=yes"
 else
@@ -4340,12 +4342,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-echo "configure:4344: checking for shl_load" >&5
+echo "configure:4346: checking for shl_load" >&5
 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4349 "configure"
+#line 4351 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shl_load(); below.  */
@@ -4368,7 +4370,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shl_load=yes"
 else
@@ -4386,7 +4388,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
-echo "configure:4390: checking for dlopen in -lsvld" >&5
+echo "configure:4392: checking for dlopen in -lsvld" >&5
 ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4394,7 +4396,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsvld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4398 "configure"
+#line 4400 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4405,7 +4407,7 @@
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:4409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4424,7 +4426,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:4428: checking for shl_load in -ldld" >&5
+echo "configure:4430: checking for shl_load in -ldld" >&5
 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4432,7 +4434,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4436 "configure"
+#line 4438 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4443,7 +4445,7 @@
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:4447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4496,7 +4498,7 @@
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
     echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
-echo "configure:4500: checking whether a program can dlopen itself" >&5
+echo "configure:4502: checking whether a program can dlopen itself" >&5
 if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4506,7 +4508,7 @@
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 4510 "configure"
+#line 4512 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -4567,7 +4569,7 @@
     exit (status);
 }
 EOF
-  if { (eval echo configure:4571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+  if { (eval echo configure:4573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -4590,7 +4592,7 @@
     if test "x$lt_cv_dlopen_self" = xyes; then
       LDFLAGS="$LDFLAGS $link_static_flag"
       echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
-echo "configure:4594: checking whether a statically linked program can dlopen itself" >&5
+echo "configure:4596: checking whether a statically linked program can dlopen itself" >&5
 if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4600,7 +4602,7 @@
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 4604 "configure"
+#line 4606 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -4661,7 +4663,7 @@
     exit (status);
 }
 EOF
-  if { (eval echo configure:4665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+  if { (eval echo configure:4667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -4710,14 +4712,14 @@
     # systems, -lgcc has to come before -lc. If gcc already passes -lc
     # to ld, don't add -lc before -lgcc.
     echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
-echo "configure:4714: checking whether -lc should be explicitly linked in" >&5
+echo "configure:4716: checking whether -lc should be explicitly linked in" >&5
     if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   $rm conftest*
     echo 'static int dummy;' > conftest.$ac_ext
 
-    if { (eval echo configure:4721: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+    if { (eval echo configure:4723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
       soname=conftest
       lib=conftest
       libobjs=conftest.$ac_objext
@@ -4730,7 +4732,7 @@
       libname=conftest
       save_allow_undefined_flag=$allow_undefined_flag
       allow_undefined_flag=
-      if { (eval echo configure:4734: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
+      if { (eval echo configure:4736: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
       then
 	lt_cv_archive_cmds_need_lc=no
       else
@@ -5309,7 +5311,7 @@
 
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:5313: checking whether build environment is sane" >&5
+echo "configure:5315: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftest.file
@@ -5350,7 +5352,7 @@
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5354: checking for $ac_word" >&5
+echo "configure:5356: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5380,7 +5382,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5384: checking for $ac_word" >&5
+echo "configure:5386: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5431,7 +5433,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5435: checking for $ac_word" >&5
+echo "configure:5437: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5463,7 +5465,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:5467: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:5469: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -5474,12 +5476,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 5478 "configure"
+#line 5480 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:5483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -5505,12 +5507,12 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:5509: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:5511: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:5514: checking whether we are using GNU C" >&5
+echo "configure:5516: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5519,7 +5521,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:5523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:5525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -5538,7 +5540,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:5542: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:5544: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5575,7 +5577,7 @@
 
 
 echo $ac_n "checking dependency style of $depcc""... $ac_c" 1>&6
-echo "configure:5579: checking dependency style of $depcc" >&5
+echo "configure:5581: checking dependency style of $depcc" >&5
 if eval "test \"`echo '$''{'am_cv_CC_dependencies_compiler_type'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5648,7 +5650,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:5652: checking for a BSD compatible install" >&5
+echo "configure:5654: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5701,7 +5703,7 @@
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:5705: checking whether ln -s works" >&5
+echo "configure:5707: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5722,7 +5724,7 @@
 fi
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:5726: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:5728: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5750,7 +5752,7 @@
 
 
         echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
-echo "configure:5754: checking for strerror in -lcposix" >&5
+echo "configure:5756: checking for strerror in -lcposix" >&5
 ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5758,7 +5760,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5762 "configure"
+#line 5764 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5769,7 +5771,7 @@
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:5773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5842,7 +5844,7 @@
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5846: checking for $ac_word" >&5
+echo "configure:5848: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5877,7 +5879,7 @@
 
   min_gtk_version=1.2.0
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:5881: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:5883: checking for GTK - version >= $min_gtk_version" >&5
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
@@ -5900,7 +5902,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 5904 "configure"
+#line 5906 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -5978,7 +5980,7 @@
 }
 
 EOF
-if { (eval echo configure:5982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -6012,7 +6014,7 @@
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 6016 "configure"
+#line 6018 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -6022,7 +6024,7 @@
  return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:6026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK or finding the wrong"
@@ -6070,7 +6072,7 @@
 fi
 
 echo $ac_n "checking whether to enable XIM support""... $ac_c" 1>&6
-echo "configure:6074: checking whether to enable XIM support" >&5
+echo "configure:6076: checking whether to enable XIM support" >&5
 if test "x$enable_xim" != xno; then
   cat >> confdefs.h <<\EOF
 #define USE_XIM 1
@@ -6084,7 +6086,7 @@
 
 
 echo $ac_n "checking whether GNOME specific code should be used""... $ac_c" 1>&6
-echo "configure:6088: checking whether GNOME specific code should be used" >&5
+echo "configure:6090: checking whether GNOME specific code should be used" >&5
 # Check whether --enable-gnome or --disable-gnome was given.
 if test "${enable_gnome+set}" = set; then
   enableval="$enable_gnome"
@@ -6134,7 +6136,7 @@
   if test "$enable_bonobo" = "yes"; then
 
     echo $ac_n "checking for Bonobo >= 0.31""... $ac_c" 1>&6
-echo "configure:6138: checking for Bonobo >= 0.31" >&5
+echo "configure:6140: checking for Bonobo >= 0.31" >&5
 
     if gnome-config --libs bonobox_print > /dev/null 2>&1; then
       vers=`gnome-config --modversion bonobo | sed -e "s/bonobo-//" | \
@@ -6210,7 +6212,7 @@
 UNICODE_LIBS=
 if test "$enable_unicode" = "yes"; then
   echo $ac_n "checking for libunicode""... $ac_c" 1>&6
-echo "configure:6214: checking for libunicode" >&5
+echo "configure:6216: checking for libunicode" >&5
   if unicode-config --libs > /dev/null 2>&1; then
     vers=`unicode-config --version`
     have_unicode=true     
@@ -6244,7 +6246,7 @@
 
 
 echo $ac_n "checking for poptSetOtherOptionHelp in -lpopt""... $ac_c" 1>&6
-echo "configure:6248: checking for poptSetOtherOptionHelp in -lpopt" >&5
+echo "configure:6250: checking for poptSetOtherOptionHelp in -lpopt" >&5
 ac_lib_var=`echo popt'_'poptSetOtherOptionHelp | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6252,7 +6254,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpopt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6256 "configure"
+#line 6258 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6263,7 +6265,7 @@
 poptSetOtherOptionHelp()
 ; return 0; }
 EOF
-if { (eval echo configure:6267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6291,17 +6293,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6295: checking for $ac_hdr" >&5
+echo "configure:6297: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6300 "configure"
+#line 6302 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6305: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6370,7 +6372,7 @@
   # Extract the first word of "libart-config", so it can be a program name with args.
 set dummy libart-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6374: checking for $ac_word" >&5
+echo "configure:6376: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_LIBART_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6405,7 +6407,7 @@
 
   min_libart_version=2.1.0
   echo $ac_n "checking for LIBART - version >= $min_libart_version""... $ac_c" 1>&6
-echo "configure:6409: checking for LIBART - version >= $min_libart_version" >&5
+echo "configure:6411: checking for LIBART - version >= $min_libart_version" >&5
   no_libart=""
   if test "$LIBART_CONFIG" = "no" ; then
     no_libart=yes
@@ -6429,7 +6431,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 6433 "configure"
+#line 6435 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -6487,7 +6489,7 @@
 
 
 EOF
-if { (eval echo configure:6491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -6525,7 +6527,7 @@
           CFLAGS="$CFLAGS $LIBART_CFLAGS"
           LIBS="$LIBS $LIBART_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 6529 "configure"
+#line 6531 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -6535,7 +6537,7 @@
  return 0; 
 ; return 0; }
 EOF
-if { (eval echo configure:6539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding LIBART or finding the wrong"
@@ -6611,7 +6613,7 @@
   # Extract the first word of "gdk-pixbuf-config", so it can be a program name with args.
 set dummy gdk-pixbuf-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6615: checking for $ac_word" >&5
+echo "configure:6617: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GDK_PIXBUF_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6646,7 +6648,7 @@
 
   min_gdk_pixbuf_version=0.7.0
   echo $ac_n "checking for GDK_PIXBUF - version >= $min_gdk_pixbuf_version""... $ac_c" 1>&6
-echo "configure:6650: checking for GDK_PIXBUF - version >= $min_gdk_pixbuf_version" >&5
+echo "configure:6652: checking for GDK_PIXBUF - version >= $min_gdk_pixbuf_version" >&5
   no_gdk_pixbuf=""
   if test "$GDK_PIXBUF_CONFIG" = "no" ; then
     no_gdk_pixbuf=yes
@@ -6670,7 +6672,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 6674 "configure"
+#line 6676 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -6728,7 +6730,7 @@
 
 
 EOF
-if { (eval echo configure:6732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -6762,7 +6764,7 @@
           CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS"
           LIBS="$LIBS $GDK_PIXBUF_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 6766 "configure"
+#line 6768 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -6772,7 +6774,7 @@
  return 0; 
 ; return 0; }
 EOF
-if { (eval echo configure:6776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GDK_PIXBUF or finding the wrong"
@@ -6809,7 +6811,7 @@
 
 png_ok=no
 echo $ac_n "checking for png_read_info in -lpng""... $ac_c" 1>&6
-echo "configure:6813: checking for png_read_info in -lpng" >&5
+echo "configure:6815: checking for png_read_info in -lpng" >&5
 ac_lib_var=`echo png'_'png_read_info | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6817,7 +6819,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpng -lz -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6821 "configure"
+#line 6823 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6828,7 +6830,7 @@
 png_read_info()
 ; return 0; }
 EOF
-if { (eval echo configure:6832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6845,17 +6847,17 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:6849: checking for png.h" >&5
+echo "configure:6851: checking for png.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6854 "configure"
+#line 6856 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6861: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6884,16 +6886,16 @@
 
 if test "$png_ok" = yes; then
   echo $ac_n "checking for png_structp in png.h""... $ac_c" 1>&6
-echo "configure:6888: checking for png_structp in png.h" >&5
+echo "configure:6890: checking for png_structp in png.h" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6890 "configure"
+#line 6892 "configure"
 #include "confdefs.h"
 #include <png.h>
 int main() {
 png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;
 ; return 0; }
 EOF
-if { (eval echo configure:6897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   png_ok=yes
 else
@@ -6936,13 +6938,30 @@
 fi
 
 
+# Check whether --enable-i18n or --disable-i18n was given.
+if test "${enable_i18n+set}" = set; then
+  enableval="$enable_i18n"
+  :
+else
+  enable_i18n=yes
+fi
+
+echo $ac_n "checking whether to disable i18n support""... $ac_c" 1>&6
+echo "configure:6951: checking whether to disable i18n support" >&5
+if test "x$enable_i18n" != xno; then
+  cat >> confdefs.h <<\EOF
+#define USE_I18N 1
+EOF
+
+fi
+echo "$ac_t""$enable_i18n" 1>&6
 
 ALL_LINGUAS="az ca da de el en_GB es fi fr ga hu it ja ko nl no pl pt pt_BR ru sl sv tr uk zh_CN.GB2312 zh_TW.Big5"
 
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6946: checking for $ac_word" >&5
+echo "configure:6965: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6970,12 +6989,12 @@
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:6974: checking for ANSI C header files" >&5
+echo "configure:6993: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6979 "configure"
+#line 6998 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -6983,7 +7002,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7006: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7000,7 +7019,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 7004 "configure"
+#line 7023 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -7018,7 +7037,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 7022 "configure"
+#line 7041 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -7039,7 +7058,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 7043 "configure"
+#line 7062 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -7050,7 +7069,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:7054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -7074,18 +7093,18 @@
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:7078: checking for working const" >&5
+echo "configure:7097: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7083 "configure"
+#line 7102 "configure"
 #include "confdefs.h"
 
 int main() {
 
 /* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x;
+typedef int charset[2]; const charset x={0,0};
 /* SunOS 4.1.1 cc rejects this.  */
 char const *const *ccp;
 char **p;
@@ -7128,7 +7147,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -7149,21 +7168,21 @@
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:7153: checking for inline" >&5
+echo "configure:7172: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 7160 "configure"
+#line 7179 "configure"
 #include "confdefs.h"
 
 int main() {
-} $ac_kw foo() {
+} $ac_kw int foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:7167: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -7189,12 +7208,12 @@
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:7193: checking for off_t" >&5
+echo "configure:7212: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7198 "configure"
+#line 7217 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -7222,12 +7241,12 @@
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:7226: checking for size_t" >&5
+echo "configure:7245: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7231 "configure"
+#line 7250 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -7257,19 +7276,19 @@
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:7261: checking for working alloca.h" >&5
+echo "configure:7280: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7266 "configure"
+#line 7285 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
-char *p = alloca(2 * sizeof(int));
+char *p = (char *)alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:7273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -7290,12 +7309,12 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:7294: checking for alloca" >&5
+echo "configure:7313: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7299 "configure"
+#line 7318 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -7323,7 +7342,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:7327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -7355,12 +7374,12 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:7359: checking whether alloca needs Cray hooks" >&5
+echo "configure:7378: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7364 "configure"
+#line 7383 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -7385,12 +7404,12 @@
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7389: checking for $ac_func" >&5
+echo "configure:7408: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7394 "configure"
+#line 7413 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7413,7 +7432,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -7440,7 +7459,7 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:7444: checking stack direction for C alloca" >&5
+echo "configure:7463: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7448,7 +7467,7 @@
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 7452 "configure"
+#line 7471 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -7467,7 +7486,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:7471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -7492,17 +7511,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7496: checking for $ac_hdr" >&5
+echo "configure:7515: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7501 "configure"
+#line 7520 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7506: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7531,12 +7550,12 @@
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7535: checking for $ac_func" >&5
+echo "configure:7554: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7540 "configure"
+#line 7559 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7559,7 +7578,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -7584,7 +7603,7 @@
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:7588: checking for working mmap" >&5
+echo "configure:7607: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7592,7 +7611,7 @@
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 7596 "configure"
+#line 7615 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -7663,6 +7682,11 @@
 
 #ifdef __cplusplus
 extern "C" { void *malloc(unsigned); }
+extern "C" { int rand(void); }
+extern "C" { int umask(int); }
+# ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+# endif
 #else
 char *malloc();
 #endif
@@ -7679,7 +7703,7 @@
 	/*
 	 * First, make a file with some known garbage in it.
 	 */
-	data = malloc(pagesize);
+	data = (char *)malloc(pagesize);
 	if (!data)
 		exit(1);
 	for (i = 0; i < pagesize; ++i)
@@ -7700,7 +7724,7 @@
 	fd = open("conftestmmap", O_RDWR);
 	if (fd < 0)
 		exit(1);
-	data2 = malloc(2 * pagesize);
+	data2 = (char *)malloc(2 * pagesize);
 	if (!data2)
 		exit(1);
 	data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
@@ -7718,7 +7742,7 @@
 	 */
 	for (i = 0; i < pagesize; ++i)
 		*(data2 + i) = *(data2 + i) + 1;
-	data3 = malloc(pagesize);
+	data3 = (char *)malloc(pagesize);
 	if (!data3)
 		exit(1);
 	if (read(fd, data3, pagesize) != pagesize)
@@ -7732,7 +7756,7 @@
 }
 
 EOF
-if { (eval echo configure:7736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -7760,17 +7784,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7764: checking for $ac_hdr" >&5
+echo "configure:7788: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7769 "configure"
+#line 7793 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7774: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7798: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7801,12 +7825,12 @@
 __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7805: checking for $ac_func" >&5
+echo "configure:7829: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7810 "configure"
+#line 7834 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7829,7 +7853,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -7856,7 +7880,7 @@
 
    
       echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:7860: checking for iconv" >&5
+echo "configure:7884: checking for iconv" >&5
 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7864,7 +7888,7 @@
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     cat > conftest.$ac_ext <<EOF
-#line 7868 "configure"
+#line 7892 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -7874,7 +7898,7 @@
        iconv_close(cd);
 ; return 0; }
 EOF
-if { (eval echo configure:7878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_func_iconv=yes
 else
@@ -7886,7 +7910,7 @@
       am_save_LIBS="$LIBS"
       LIBS="$LIBS -liconv"
       cat > conftest.$ac_ext <<EOF
-#line 7890 "configure"
+#line 7914 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -7896,7 +7920,7 @@
          iconv_close(cd);
 ; return 0; }
 EOF
-if { (eval echo configure:7900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
@@ -7917,13 +7941,13 @@
 EOF
 
     echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
-echo "configure:7921: checking for iconv declaration" >&5
+echo "configure:7945: checking for iconv declaration" >&5
     if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
       cat > conftest.$ac_ext <<EOF
-#line 7927 "configure"
+#line 7951 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7942,7 +7966,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   am_cv_proto_iconv_arg1=""
 else
@@ -7971,19 +7995,19 @@
 
    
   echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
-echo "configure:7975: checking for nl_langinfo and CODESET" >&5
+echo "configure:7999: checking for nl_langinfo and CODESET" >&5
 if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7980 "configure"
+#line 8004 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int main() {
 char* cs = nl_langinfo(CODESET);
 ; return 0; }
 EOF
-if { (eval echo configure:7987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_langinfo_codeset=yes
 else
@@ -8006,19 +8030,19 @@
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:8010: checking for LC_MESSAGES" >&5
+echo "configure:8034: checking for LC_MESSAGES" >&5
 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8015 "configure"
+#line 8039 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:8022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_val_LC_MESSAGES=yes
 else
@@ -8039,7 +8063,7 @@
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:8043: checking whether NLS is requested" >&5
+echo "configure:8067: checking whether NLS is requested" >&5
         # Check whether --enable-nls or --disable-nls was given.
 if test "${enable_nls+set}" = set; then
   enableval="$enable_nls"
@@ -8060,7 +8084,7 @@
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:8064: checking whether included gettext is requested" >&5
+echo "configure:8088: checking whether included gettext is requested" >&5
       # Check whether --with-included-gettext or --without-included-gettext was given.
 if test "${with_included_gettext+set}" = set; then
   withval="$with_included_gettext"
@@ -8080,17 +8104,17 @@
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:8084: checking for libintl.h" >&5
+echo "configure:8108: checking for libintl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8089 "configure"
+#line 8113 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8107,12 +8131,12 @@
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6
-echo "configure:8111: checking for GNU gettext in libc" >&5
+echo "configure:8135: checking for GNU gettext in libc" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8116 "configure"
+#line 8140 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
@@ -8121,7 +8145,7 @@
 return (int) gettext ("") + _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:8125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gnugettext1_libc=yes
 else
@@ -8137,14 +8161,14 @@
 
 	   if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
 	     echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6
-echo "configure:8141: checking for GNU gettext in libintl" >&5
+echo "configure:8165: checking for GNU gettext in libintl" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   gt_save_LIBS="$LIBS"
 		LIBS="$LIBS -lintl"
 		cat > conftest.$ac_ext <<EOF
-#line 8148 "configure"
+#line 8172 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
@@ -8153,7 +8177,7 @@
 return (int) gettext ("") + _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:8157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gnugettext1_libintl=yes
 else
@@ -8178,12 +8202,12 @@
 	     for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8182: checking for $ac_func" >&5
+echo "configure:8206: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8187 "configure"
+#line 8211 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8206,7 +8230,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8233,7 +8257,7 @@
 	     # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8237: checking for $ac_word" >&5
+echo "configure:8261: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8267,7 +8291,7 @@
 	       # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8271: checking for $ac_word" >&5
+echo "configure:8295: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8304,7 +8328,7 @@
 	     # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8308: checking for $ac_word" >&5
+echo "configure:8332: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8356,7 +8380,7 @@
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8360: checking for $ac_word" >&5
+echo "configure:8384: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8390,7 +8414,7 @@
         # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8394: checking for $ac_word" >&5
+echo "configure:8418: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8426,7 +8450,7 @@
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8430: checking for $ac_word" >&5
+echo "configure:8454: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8492,7 +8516,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8496: checking for $ac_word" >&5
+echo "configure:8520: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8525,7 +8549,7 @@
       ac_verc_fail=yes
     else
             echo $ac_n "checking version of bison""... $ac_c" 1>&6
-echo "configure:8529: checking version of bison" >&5
+echo "configure:8553: checking version of bison" >&5
       ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'`
       case $ac_prog_version in
         '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -8566,7 +8590,7 @@
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:8570: checking for catalogs to be installed" >&5
+echo "configure:8594: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for presentlang in $ALL_LINGUAS; do
          useit=no
@@ -8628,7 +8652,7 @@
 # Extract the first word of "xml-config", so it can be a program name with args.
 set dummy xml-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8632: checking for $ac_word" >&5
+echo "configure:8656: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_XML_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8657,7 +8681,7 @@
 if test "$XML_CONFIG" != "" 
 then
   echo $ac_n "checking for libxml >= 1.8.5""... $ac_c" 1>&6
-echo "configure:8661: checking for libxml >= 1.8.5" >&5
+echo "configure:8685: checking for libxml >= 1.8.5" >&5
   vers=`$XML_CONFIG --version | sed -e "s/libxml //" | awk 'BEGIN {FS=".";} { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
   if test "$vers" -ge 1008005; then
     echo "$ac_t""found" 1>&6
@@ -8677,12 +8701,12 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:8681: checking for $ac_hdr that defines DIR" >&5
+echo "configure:8705: checking for $ac_hdr that defines DIR" >&5
 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8686 "configure"
+#line 8710 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -8690,7 +8714,7 @@
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:8694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -8715,7 +8739,7 @@
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:8719: checking for opendir in -ldir" >&5
+echo "configure:8743: checking for opendir in -ldir" >&5
 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8723,7 +8747,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8727 "configure"
+#line 8751 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8734,7 +8758,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:8738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8756,7 +8780,7 @@
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:8760: checking for opendir in -lx" >&5
+echo "configure:8784: checking for opendir in -lx" >&5
 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8764,7 +8788,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8768 "configure"
+#line 8792 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8775,7 +8799,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:8779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8798,12 +8822,12 @@
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:8802: checking for ANSI C header files" >&5
+echo "configure:8826: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8807 "configure"
+#line 8831 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -8811,7 +8835,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8828,7 +8852,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 8832 "configure"
+#line 8856 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -8846,7 +8870,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 8850 "configure"
+#line 8874 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -8867,7 +8891,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 8871 "configure"
+#line 8895 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -8878,7 +8902,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:8882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -8905,17 +8929,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8909: checking for $ac_hdr" >&5
+echo "configure:8933: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8914 "configure"
+#line 8938 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8943,18 +8967,18 @@
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:8947: checking for working const" >&5
+echo "configure:8971: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8952 "configure"
+#line 8976 "configure"
 #include "confdefs.h"
 
 int main() {
 
 /* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x;
+typedef int charset[2]; const charset x={0,0};
 /* SunOS 4.1.1 cc rejects this.  */
 char const *const *ccp;
 char **p;
@@ -8997,7 +9021,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:9001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -9021,12 +9045,12 @@
 for ac_func in select strcspn strdup strtol snprintf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9025: checking for $ac_func" >&5
+echo "configure:9049: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9030 "configure"
+#line 9054 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -9049,7 +9073,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:9053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -9082,18 +9106,18 @@
 
 
   echo $ac_n "checking if C compiler accepts -Wall""... $ac_c" 1>&6
-echo "configure:9086: checking if C compiler accepts -Wall" >&5
+echo "configure:9110: checking if C compiler accepts -Wall" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -Wall"
   cat > conftest.$ac_ext <<EOF
-#line 9090 "configure"
+#line 9114 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("hello");
 ; return 0; }
 EOF
-if { (eval echo configure:9097: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9121: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -9107,18 +9131,18 @@
 
 
   echo $ac_n "checking if C compiler accepts -Wunused""... $ac_c" 1>&6
-echo "configure:9111: checking if C compiler accepts -Wunused" >&5
+echo "configure:9135: checking if C compiler accepts -Wunused" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -Wunused"
   cat > conftest.$ac_ext <<EOF
-#line 9115 "configure"
+#line 9139 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("hello");
 ; return 0; }
 EOF
-if { (eval echo configure:9122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -9132,18 +9156,18 @@
 
 
   echo $ac_n "checking if C compiler accepts -Winline""... $ac_c" 1>&6
-echo "configure:9136: checking if C compiler accepts -Winline" >&5
+echo "configure:9160: checking if C compiler accepts -Winline" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -Winline"
   cat > conftest.$ac_ext <<EOF
-#line 9140 "configure"
+#line 9164 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("hello");
 ; return 0; }
 EOF
-if { (eval echo configure:9147: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -9157,18 +9181,18 @@
 
 
   echo $ac_n "checking if C compiler accepts -Wmissing-prototypes""... $ac_c" 1>&6
-echo "configure:9161: checking if C compiler accepts -Wmissing-prototypes" >&5
+echo "configure:9185: checking if C compiler accepts -Wmissing-prototypes" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -Wmissing-prototypes"
   cat > conftest.$ac_ext <<EOF
-#line 9165 "configure"
+#line 9189 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("hello");
 ; return 0; }
 EOF
-if { (eval echo configure:9172: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -9182,18 +9206,18 @@
 
 
   echo $ac_n "checking if C compiler accepts -Wmissing-declarations""... $ac_c" 1>&6
-echo "configure:9186: checking if C compiler accepts -Wmissing-declarations" >&5
+echo "configure:9210: checking if C compiler accepts -Wmissing-declarations" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -Wmissing-declarations"
   cat > conftest.$ac_ext <<EOF
-#line 9190 "configure"
+#line 9214 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("hello");
 ; return 0; }
 EOF
-if { (eval echo configure:9197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -9210,18 +9234,18 @@
   i?86-pc-*)
     
   echo $ac_n "checking if C compiler accepts -fomit-frame-pointer""... $ac_c" 1>&6
-echo "configure:9214: checking if C compiler accepts -fomit-frame-pointer" >&5
+echo "configure:9238: checking if C compiler accepts -fomit-frame-pointer" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -fomit-frame-pointer"
   cat > conftest.$ac_ext <<EOF
-#line 9218 "configure"
+#line 9242 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("hello");
 ; return 0; }
 EOF
-if { (eval echo configure:9225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -9238,18 +9262,18 @@
 
 
   echo $ac_n "checking if C compiler accepts -finline-functions""... $ac_c" 1>&6
-echo "configure:9242: checking if C compiler accepts -finline-functions" >&5
+echo "configure:9266: checking if C compiler accepts -finline-functions" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -finline-functions"
   cat > conftest.$ac_ext <<EOF
-#line 9246 "configure"
+#line 9270 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("hello");
 ; return 0; }
 EOF
-if { (eval echo configure:9253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -9263,18 +9287,18 @@
 
 
   echo $ac_n "checking if C compiler accepts -fstrict-aliasing""... $ac_c" 1>&6
-echo "configure:9267: checking if C compiler accepts -fstrict-aliasing" >&5
+echo "configure:9291: checking if C compiler accepts -fstrict-aliasing" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -fstrict-aliasing"
   cat > conftest.$ac_ext <<EOF
-#line 9271 "configure"
+#line 9295 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("hello");
 ; return 0; }
 EOF
-if { (eval echo configure:9278: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -9290,7 +9314,7 @@
 # Extract the first word of "db2html", so it can be a program name with args.
 set dummy db2html; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9294: checking for $ac_word" >&5
+echo "configure:9318: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_DB2HTML'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9353,7 +9377,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9357: checking for $ac_word" >&5
+echo "configure:9381: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9392,7 +9416,7 @@
 
     
     echo $ac_n "checking if Python version >= 1.5.2""... $ac_c" 1>&6
-echo "configure:9396: checking if Python version >= 1.5.2" >&5
+echo "configure:9420: checking if Python version >= 1.5.2" >&5
         prog="
 import sys, string
 minver = '1.5.2'
@@ -9417,7 +9441,7 @@
   
 
   echo $ac_n "checking local Python configuration""... $ac_c" 1>&6
-echo "configure:9421: checking local Python configuration" >&5
+echo "configure:9445: checking local Python configuration" >&5
 
       
   
@@ -9458,7 +9482,7 @@
   
 py_mod_var=`echo gtk'_' | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for python module gtk""... $ac_c" 1>&6
-echo "configure:9462: checking for python module gtk" >&5
+echo "configure:9486: checking for python module gtk" >&5
 if eval "test \"`echo '$''{'py_cv_mod_$py_mod_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9491,7 +9515,7 @@
 
   
 echo $ac_n "checking for headers required to compile python extensions""... $ac_c" 1>&6
-echo "configure:9495: checking for headers required to compile python extensions" >&5
+echo "configure:9519: checking for headers required to compile python extensions" >&5
 py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
 py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
 PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
@@ -9502,12 +9526,12 @@
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
 cat > conftest.$ac_ext <<EOF
-#line 9506 "configure"
+#line 9530 "configure"
 #include "confdefs.h"
 #include <Python.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9528,7 +9552,7 @@
 
 
 echo $ac_n "checking for libpython${PYTHON_VERSION}.a""... $ac_c" 1>&6
-echo "configure:9532: checking for libpython${PYTHON_VERSION}.a" >&5
+echo "configure:9556: checking for libpython${PYTHON_VERSION}.a" >&5
 
 py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
 
Index: dia/dia-0.88.1/configure.in
diff -u dia/dia-0.88.1/configure.in:1.1.1.1 dia/dia-0.88.1/configure.in:1.2
--- dia/dia-0.88.1/configure.in:1.1.1.1	Mon Sep 24 10:42:06 2001
+++ dia/dia-0.88.1/configure.in	Sun Sep 30 15:00:22 2001
@@ -207,6 +207,13 @@
 dnl
 dnl i18n
 dnl
+AC_ARG_ENABLE(i18n,
+[  --disable-i18n           disable i18n code],,enable_i18n=yes)
+AC_MSG_CHECKING([whether to disable i18n support])
+if test "x$enable_i18n" != xno; then
+  AC_DEFINE(USE_I18N)
+fi
+AC_MSG_RESULT($enable_i18n)
 
 ALL_LINGUAS="az ca da de el en_GB es fi fr ga hu it ja ko nl no pl pt pt_BR ru sl sv tr uk zh_CN.GB2312 zh_TW.Big5"
 
Index: dia/dia-0.88.1/app/disp_callbacks.c
diff -u dia/dia-0.88.1/app/disp_callbacks.c:1.1.1.1 dia/dia-0.88.1/app/disp_callbacks.c:1.2
--- dia/dia-0.88.1/app/disp_callbacks.c:1.1.1.1	Mon Sep 24 10:42:07 2001
+++ dia/dia-0.88.1/app/disp_callbacks.c	Sun Sep 30 15:00:22 2001
@@ -304,7 +304,7 @@
     if (ddisp->ic == NULL)
       g_warning("could not create input context");
     else {
-      gtk_widget_add_events(ddisp->canvas, gdk_ic_get_events(ddisp->ic));
+      gtk_widget_add_events(ddisp->canvas->window, gdk_ic_get_events(ddisp->ic));
 
       if (GTK_WIDGET_HAS_FOCUS(widget))
 	gdk_im_begin(ddisp->ic, widget->window);
Index: dia/dia-0.88.1/app/render_eps.c
diff -u dia/dia-0.88.1/app/render_eps.c:1.1.1.1 dia/dia-0.88.1/app/render_eps.c:1.3.2.2
--- dia/dia-0.88.1/app/render_eps.c:1.1.1.1	Mon Sep 24 10:42:07 2001
+++ dia/dia-0.88.1/app/render_eps.c	Sun Oct 14 03:30:17 2001
@@ -1161,10 +1161,61 @@
 static void
 set_font(RendererEPS *renderer, Font *font, real height)
 {
+#ifdef USE_I18N
+  renderer->font = font;
+  renderer->font_height = height;
+#else
   fprintf(renderer->file, "/%s-latin1 ff %f scf sf\n",
 	  font_get_psfontname(font), (double)height);
+#endif
 }
 
+#ifdef USE_I18N
+static void 
+set_font_sb(RendererEPS *renderer, Font *font, real height)
+{
+  fprintf(renderer->file, " /%s-latin1 ff %f scf sf\n",
+	  font_get_psfontname(font), (double)height);
+}
+static void
+set_font_mb(RendererEPS *renderer, Font *font, real height)
+{
+  fprintf(renderer->file, " /%s-EUC-H ff %f scf sf\n",
+	  font_get_psfontname_mb(font), (double)height);
+}
+
+static int
+wc_char_len(const GdkWChar *wcsrc, int wclen, int wcpos) {
+  int len;
+  char *text;
+  GdkWChar *wc;
+  GdkWChar wc1;
+
+  wc = wcsrc;
+
+  if (wc != NULL && wcpos > wclen) {
+    return 0;
+  }
+  
+  if (wclen != wcpos) {
+    wc1 = wc[wcpos+1];
+    wc[wcpos+1] = '\0';
+    text = gdk_wcstombs(wc+wcpos);
+    wc[wcpos+1] = wc1;
+  } else {
+    text = gdk_wcstombs(wc+wcpos);
+  }
+
+  if (text == NULL) {
+    return 0;
+  } else {
+    len = strlen(text);
+    g_free(text);
+    return len;
+  }
+}
+#endif /* ifdef USE_I18N */
+
 static void
 draw_string(RendererEPS *renderer,
 	    const char *text,
@@ -1174,6 +1225,15 @@
   char *buffer;
   const char *str;
   int len;
+#ifdef USE_I18N
+  Point _pos;
+  GdkWChar *wc;
+  GdkWChar wc1;
+  int wclen;
+  int mblen;
+  int wc_cursor;
+  int sw_flag; /* single (1) or multi (2)  bytes flag */
+#endif
 
   /* TODO: Use latin-1 encoding */
 
@@ -1192,7 +1252,58 @@
       strncat(buffer, str, 1);
       str++;
     }
+   }
+#ifdef USE_I18N
+  /** basic idea
+   * 1. we need some separators to delimit the complex wc string, 
+   *   such as involving single and multi byte string.
+   **/
+  /* convert */
+  wc = g_new(GdkWChar, strlen(buffer)+1);
+  mblen = strlen(buffer);
+  wclen = gdk_mbstowcs(wc, buffer, mblen);
+  wc[wclen] = '\0';
+  
+  /* treat any arignment as ARIGN_LEFT*/
+  _pos = *pos;
+  if(alignment == ALIGN_RIGHT) {
+    _pos.x -= 
+      font_string_width(buffer, renderer->font, renderer->font_height);
+  } else if (alignment == ALIGN_CENTER) {
+    _pos.x -= 
+      font_string_width(buffer, renderer->font, renderer->font_height) / 2;
   }
+  g_free(buffer);
+  fprintf(renderer->file, "%f %f m gs 1 -1 sc\n", _pos.x, _pos.y);
+  fprintf(renderer->file, "gs\n");
+
+  sw_flag = wc_char_len(wc, wclen, 0);
+  wc_cursor = 0;
+  while (wc_cursor < wclen && sw_flag > 0) {
+    int wc_begin = wc_cursor;
+    while (wc_cursor < wclen && sw_flag == wc_char_len(wc, wclen, wc_cursor)) {
+      wc_cursor++;
+    }
+    wc1 = wc[wc_cursor];
+    wc[wc_cursor] = '\0';
+
+    if (sw_flag == 1) {
+      set_font_sb(renderer, renderer->font, renderer->font_height);
+    } else {
+      set_font_mb(renderer, renderer->font, renderer->font_height);
+    }
+    buffer = gdk_wcstombs(wc + wc_begin);
+    fprintf(renderer->file, " (%s) sh\n", buffer);
+
+    g_free(buffer);
+
+    wc[wc_cursor] = wc1;
+    sw_flag = wc_char_len(wc, wclen, wc_cursor);
+  }
+
+  fprintf(renderer->file, "gr gr\n");
+  g_free(wc);
+#else /* ! USE_I18N */
   fprintf(renderer->file, "(%s) ", buffer);
   g_free(buffer);
   
@@ -1211,6 +1322,7 @@
   }
   
   fprintf(renderer->file, " gs 1 -1 sc sh gr\n");
+#endif /* ifdef USE_I18N */
 }
 
 #endif /* HAVE_UNICODE */
Index: dia/dia-0.88.1/app/render_eps.h
diff -u dia/dia-0.88.1/app/render_eps.h:1.1.1.1 dia/dia-0.88.1/app/render_eps.h:1.2
--- dia/dia-0.88.1/app/render_eps.h:1.1.1.1	Mon Sep 24 10:42:07 2001
+++ dia/dia-0.88.1/app/render_eps.h	Sun Sep 30 15:00:22 2001
@@ -45,6 +45,10 @@
   PSUnicoder *psu;
 #endif
   Color lcolor;
+#ifdef USE_I18N
+  Font *font;
+  real font_height;
+#endif
 };
 
 RendererEPS *new_eps_renderer(Diagram *dia, char *filename);
Index: dia/dia-0.88.1/app/render_libart.c
diff -u dia/dia-0.88.1/app/render_libart.c:1.1.1.1 dia/dia-0.88.1/app/render_libart.c:1.2
--- dia/dia-0.88.1/app/render_libart.c:1.1.1.1	Mon Sep 24 10:42:07 2001
+++ dia/dia-0.88.1/app/render_libart.c	Sun Sep 30 15:00:22 2001
@@ -1110,6 +1110,92 @@
   art_svp_free( svp );
 }
 
+#ifdef USE_I18N
+static
+SuckFont *
+get_suckfont (GdkFont *font, guchar *sentence)
+{
+  SuckFont *suckfont;
+  int x, y;
+  int lbearing, rbearing, ch_width, ascent, descent;
+  GdkPixmap *pixmap;
+  GdkColor black, white;
+  GdkImage *image;
+  GdkGC *gc;
+  guchar *line;
+  int width, height;
+  int black_pixel, pixel;
+
+  if (!font)
+    return NULL;
+
+  suckfont = g_new (SuckFont, 1);
+
+  height = font->ascent + font->descent;
+  x = 0;
+  gdk_string_extents(font, sentence,
+		     &lbearing, &rbearing, &ch_width, &ascent, &descent);
+  suckfont->chars[0].left_sb = lbearing;
+  suckfont->chars[0].right_sb = ch_width - rbearing;
+  suckfont->chars[0].width = rbearing - lbearing;
+  suckfont->chars[0].ascent = ascent;
+  suckfont->chars[0].descent = descent;
+  suckfont->chars[0].bitmap_offset = x;
+  x += (ch_width + 31) & -32;
+  width = x;
+
+  suckfont->bitmap_width = width;
+  suckfont->bitmap_height = height+1;
+  suckfont->ascent = font->ascent+1;
+
+  pixmap = gdk_pixmap_new (NULL, suckfont->bitmap_width,
+			   suckfont->bitmap_height, 1);
+  gc = gdk_gc_new (pixmap);
+  gdk_gc_set_font (gc, font);
+
+  black_pixel = color_gdk_black.pixel;
+  black.pixel = black_pixel;
+  white.pixel = color_gdk_white.pixel;
+  gdk_gc_set_foreground (gc, &white);
+  gdk_draw_rectangle (pixmap, gc, 1, 0, 0, suckfont->bitmap_width, suckfont->bitmap_height);
+
+  gdk_gc_set_foreground (gc, &black);
+
+  gdk_draw_string (pixmap, font, gc,
+		   suckfont->chars[0].bitmap_offset - suckfont->chars[0].left_sb,
+		   font->ascent+1,
+		   sentence);
+
+  /* The handling of the image leaves me with distinct unease.  But this
+   * is more or less copied out of gimp/app/text_tool.c, so it _ought_ to
+   * work. -RLL
+   */
+
+  image = gdk_image_get (pixmap, 0, 0, suckfont->bitmap_width, suckfont->bitmap_height);
+  suckfont->bitmap = g_malloc0 ((width >> 3) * suckfont->bitmap_height);
+
+  line = suckfont->bitmap;
+  for (y = 0; y < suckfont->bitmap_height; y++) {
+    for (x = 0; x < suckfont->bitmap_width; x++) {
+      pixel = gdk_image_get_pixel (image, x, y);
+      if (pixel == black_pixel)
+	line[x >> 3] |= 128 >> (x & 7);
+    }
+    line += width >> 3;
+  }
+
+  gdk_image_destroy (image);
+
+  /* free the pixmap */
+  gdk_pixmap_unref (pixmap);
+
+  /* free the gc */
+  gdk_gc_destroy (gc);
+
+  return suckfont;
+}
+#endif
+
 static void
 draw_string(RendererLibart *renderer,
 	    const char *text,
@@ -1140,7 +1226,11 @@
     break;
   }
 
+#ifdef USE_I18N
+  suckfont = get_suckfont(renderer->gdk_font, text);
+#else
   suckfont = renderer->suck_font;
+#endif
 
   xpos = (double) x + 1; 
   ypos = (double) (y - suckfont->ascent);
@@ -1148,6 +1238,26 @@
   rgba = color_to_rgba(color);
   
   len = strlen(text);
+#ifdef USE_I18N
+  {
+    SuckChar *ch;
+
+    ch = &suckfont->chars[0];
+    art_affine_translate(affine, xpos, ypos);
+    art_rgb_bitmap_affine(renderer->rgb_buffer,
+			  0, 0,
+			  renderer->renderer.pixel_width,
+			  renderer->renderer.pixel_height,
+			  renderer->renderer.pixel_width*3,
+			  suckfont->bitmap + (ch->bitmap_offset >> 3),
+			  ch->width,
+			  suckfont->bitmap_height,
+			  suckfont->bitmap_width >> 3,
+			  rgba,
+			  affine,
+			  ART_FILTER_NEAREST, NULL);
+  }
+#else
   for (i = 0; i < len; i++) {
     SuckChar *ch;
     
@@ -1169,7 +1279,7 @@
     dx = ch->left_sb + ch->width + ch->right_sb;
     xpos += dx;
   }
-
+#endif
   
   
 }
@@ -1588,6 +1698,7 @@
     ptr += stride;
   }
 }
+
 
 #else
 
Index: dia/dia-0.88.1/lib/font.c
diff -u dia/dia-0.88.1/lib/font.c:1.1.1.1 dia/dia-0.88.1/lib/font.c:1.3.2.1
--- dia/dia-0.88.1/lib/font.c:1.1.1.1	Mon Sep 24 10:42:06 2001
+++ dia/dia-0.88.1/lib/font.c	Sun Oct 14 03:52:52 2001
@@ -63,6 +63,10 @@
 
 #define NUM_X11_FONTS 2
 
+#ifdef USE_I18N
+#define NUM_PS_FONTS 2
+#endif
+
 typedef struct _FontPrivate FontPrivate;
 typedef struct  _FontCacheItem FontCacheItem;
 
@@ -76,7 +80,11 @@
   Font public;
   char *fontname_x11;
   char **fontname_x11_vec;
+#ifdef USE_I18N
+  char *fontname_ps[NUM_PS_FONTS];
+#else
   char *fontname_ps;
+#endif
   FontCacheItem *cache[FONTCACHE_SIZE];
   real ascent_ratio, descent_ratio;
 };
@@ -84,10 +92,260 @@
 
 typedef struct _FontData {
   char *fontname;
+#ifdef USE_I18N
+  char *fontname_ps[NUM_PS_FONTS];
+#else
   char *fontname_ps;
+#endif
   char *fontname_x11[NUM_X11_FONTS]; /* First choice */
 } FontData;
 
+#ifdef USE_I18N
+FontData font_data[] = {
+  { "Times-Roman",
+    { "Times-Roman", "Ryumin-Light" },
+    { "-adobe-times-medium-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+  { "Times-Italic",
+    { "Times-Italic","Ryumin-Light" },
+    { "-adobe-times-medium-i-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  }, 
+  { "Times-Bold",
+    { "Times-Bold","GothicBBB-Medium" },
+    { "-adobe-times-bold-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  }, 
+  { "Times-BoldItalic",
+    { "Times-BoldItalic","GothicBBB-Medium" },
+    { "-adobe-times-bold-i-normal-*-%d-*-*-*-*-*-*-*,-jis-*-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  }, 
+  { "AvantGarde-Book",
+    { "AvantGarde-Book","Ryumin-Light" },
+    { "-adobe-avantgarde-book-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-schumacher-clean-medium-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "AvantGarde-BookOblique",
+    { "AvantGarde-BookOblique","Ryumin-Light" },
+    { "-adobe-avantgarde-book-o-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-schumacher-clean-medium-i-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "AvantGarde-Demi",
+    { "AvantGarde-Demi","GothicBBB-Medium" },
+    { "-adobe-avantgarde-demibold-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-schumacher-clean-bold-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "AvantGarde-DemiOblique",
+    { "AvantGarde-DemiOblique","GothicBBB-Medium" },
+    { "-adobe-avantgarde-demibold-o-normal-*-%d-*-*-*-*-*-*-*,-jis-*-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-schumacher-clean-bold-i-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Bookman-Light",
+    { "Bookman-Light","Ryumin-Light" },
+    { "-adobe-bookman-light-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-times-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Bookman-LightItalic",
+    { "Bookman-LightItalic","Ryumin-Light" },
+    { "-adobe-bookman-light-i-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-times-medium-i-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Bookman-Demi",
+    { "Bookman-Demi","GothicBBB-Medium" },
+    { "-adobe-bookman-demibold-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-times-bold-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-bold-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Bookman-DemiItalic",
+    { "Bookman-DemiItalic","GothicBBB-Medium" },
+    { "-adobe-bookman-demibold-i-normal-*-%d-*-*-*-*-*-*-*,-jis-*-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-times-bold-i-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+#ifndef G_OS_WIN32
+  { "Courier",
+    { "Courier","Ryumin-Light" },
+    { "-adobe-courier-medium-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+  { "Courier-Oblique",
+    { "Courier-Oblique","Ryumin-Light" },
+    { "-adobe-courier-medium-o-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+  { "Courier-Bold",
+    { "Courier-Bold","GothicBBB-Medium" },
+    { "-adobe-courier-bold-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+  { "Courier-BoldOblique",
+    { "Courier-BoldOblique","GothicBBB-Medium" },
+    { "-adobe-courier-bold-o-normal-*-%d-*-*-*-*-*-*-*,-jis-*-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+#else /* G_OS_WIN32 */
+  /* HB: force usage of true type font "Courier New", using the bitmap
+   * version causes scaling problems mainly with uml. FIXME: there
+   * must be a better way to do this ?
+   */
+  { "Courier",
+    { "Courier","Ryumin-Light" },
+    { "-adobe-courier new-medium-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+  { "Courier-Oblique",
+    { "Courier-Oblique","Ryumin-Light" },
+    { "-adobe-courier new-medium-o-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+  { "Courier-Bold",
+    { "Courier-Bold","Ryumin-Light" },
+    { "-adobe-courier new-bold-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+  { "Courier-BoldOblique",
+    { "Courier-BoldOblique","GothicBBB-Medium" },
+    { "-adobe-courier new-bold-o-normal-*-%d-*-*-*-*-*-*-*,-jis-*-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+#endif
+  { "Helvetica",
+    { "Helvetica", "Ryumin-Light" },
+    { "-adobe-helvetica-medium-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+  { "Helvetica-Oblique",
+    { "Helvetica-Oblique","Ryumin-Light" },
+    { "-adobe-helvetica-medium-o-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+  { "Helvetica-Bold",
+    { "Helvetica-Bold","GothicBBB-Medium" },
+    { "-adobe-helvetica-bold-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+  { "Helvetica-BoldOblique",
+    { "Helvetica-BoldOblique", "GothicBBB-Medium" },
+    { "-adobe-helvetica-bold-o-normal-*-%d-*-*-*-*-*-*-*,-jis-*-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+  { "Helvetica-Narrow",
+    { "Helvetica-Narrow", "Ryumin-Light" },
+    { "-adobe-helvetica-medium-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+  { "Helvetica-Narrow-Oblique",
+    { "Helvetica-Narrow-Oblique", "Ryumin-Light" },
+    { "-adobe-helvetica-medium-o-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+  { "Helvetica-Narrow-Bold",
+    { "Helvetica-Narrow-Bold", "GothicBBB-Medium" },
+    { "-adobe-helvetica-bold-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+  { "Helvetica-Narrow-BoldOblique",
+    { "Helvetica-Narrow-BoldOblique", "GothicBBB-Medium" },
+    { "-adobe-helvetica-bold-o-normal-*-%d-*-*-*-*-*-*-*,-jis-*-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+  { "NewCenturySchoolbook-Roman",
+    { "NewCenturySchlbk-Roman", "Ryumin-Light" },
+    { "-adobe-new century schoolbook-medium-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+  { "NewCenturySchoolbook-Italic",
+    { "NewCenturySchlbk-Italic", "Ryumin-Light" },
+    { "-adobe-new century schoolbook-medium-i-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+  { "NewCenturySchoolbook-Bold",
+    { "NewCenturySchlbk-Bold","GothicBBB-Medium" },
+    { "-adobe-new century schoolbook-bold-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+  { "NewCenturySchoolbook-BoldItalic",
+    { "NewCenturySchlbk-BoldItalic", "GothicBBB-Medium" },
+    { "-adobe-new century schoolbook-bold-i-normal-*-%d-*-*-*-*-*-*-*,-jis-*-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+  { "Palatino-Roman",
+    { "Palatino-Roman", "Ryumin-Light" },
+    { "-adobe-palatino-medium-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-*-lucidabright-medium-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Palatino-Italic",
+    { "Palatino-Italic", "Ryumin-Light" },
+    { "-adobe-palatino-medium-i-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-*-lucidabright-medium-i-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Palatino-Bold",
+    { "Palatino-Bold", "GothicBBB-Medium" },
+    { "-adobe-palatino-bold-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-*-lucidabright-demibold-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-bold-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Palatino-BoldItalic",
+    { "Palatino-BoldItalic", "GothicBBB-Medium" },
+    { "-adobe-palatino-bold-i-normal-*-%d-*-*-*-*-*-*-*,-jis-*-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-*-lucidabright-demibold-i-normal-*-%d-*-*-*-*-*-*-*,-jis-*-bold-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Symbol",
+    { "Symbol", "Ryumin-Light" },
+    {
+      "-adobe-symbol-medium-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-*-symbol-medium-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "ZapfChancery-MediumItalic",
+    { "ZapfChancery-MediumItalic", "Ryumin-Light" },
+    { "-adobe-zapf chancery-medium-i-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-*-itc zapf chancery-medium-i-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "ZapfDingbats",
+    { "ZapfDingbats", "Ryumin-Light" },
+    { "-adobe-zapf dingbats-medium-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-*-itc zapf dingbats-*-*-*-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+};
+#else
 FontData font_data[] = {
   { "Times-Roman",
     "Times-Roman",
@@ -332,6 +590,7 @@
     }
   },
 };
+#endif
 
 #define NUM_FONTS (sizeof(font_data)/sizeof(FontData))
 
@@ -340,7 +599,11 @@
 GHashTable *fonts_hash = NULL;
 
 char *last_resort_fonts[] = {
+#ifdef USE_I18N
+  "-adobe-courier-medium-r-normal-*-%d-*-*-*-*-*-*-*,-jis-*-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+#else
   "-adobe-courier-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+#endif
   "fixed" /* Must be last. This is guaranteed to exist on an X11 system. */
 };
 #define NUM_LAST_RESORT_FONTS (sizeof(last_resort_fonts)/sizeof(char *))
@@ -362,11 +625,21 @@
     x11_font = font->fontname_x11_vec[i];
     if (x11_font == NULL)
       break;
+#ifdef USE_I18N
+    bufsize = strlen(x11_font)+12;  /* Should be enought*/
+    buffer = (char *)g_malloc(bufsize);
+    g_snprintf(buffer, bufsize, x11_font, 100, 100);
+
+
+    gdk_font = gdk_fontset_load(buffer);
+#else
     bufsize = strlen(x11_font)+6;  /* Should be enought*/
     buffer = (char *)g_malloc(bufsize);
     g_snprintf(buffer, bufsize, x11_font, 100);
-    
+
+
     gdk_font = gdk_font_load(buffer);
+#endif
     if (gdk_font!=NULL) {
       font->fontname_x11 = x11_font;
     }
@@ -379,11 +652,19 @@
   if (font->fontname_x11 == NULL) {
     for (i=0;i<NUM_LAST_RESORT_FONTS;i++) {
       x11_font = last_resort_fonts[i];
+#ifdef USE_I18N
+      bufsize = strlen(x11_font)+12;  /* Should be enought*/
+      buffer = (char *)g_malloc(bufsize);
+      g_snprintf(buffer, bufsize, x11_font, 100, 100);
+      
+      gdk_font = gdk_fontset_load(buffer);
+#else
       bufsize = strlen(x11_font)+6;  /* Should be enought*/
       buffer = (char *)g_malloc(bufsize);
       g_snprintf(buffer, bufsize, x11_font, 100);
       
       gdk_font = gdk_font_load(buffer);
+#endif
       g_free(buffer);
       if (gdk_font!=NULL) {
 	message_warning(_("Warning no X Font for %s found, \nusing %s instead.\n"), font->public.name, x11_font);
@@ -412,7 +693,13 @@
   for (i=0;i<NUM_FONTS;i++) {
     font = g_new(FontPrivate, 1);
     font->public.name = font_data[i].fontname;
+#ifdef USE_I18N
+    for (j=0;j<NUM_PS_FONTS;j++) {
+      font->fontname_ps[j] = font_data[i].fontname_ps[j];
+    }
+#else
     font->fontname_ps = font_data[i].fontname_ps;
+#endif
 
     font->fontname_x11 = NULL;
     font->fontname_x11_vec = font_data[i].fontname_x11;
@@ -483,10 +770,17 @@
   char *buffer;
   GdkFont *gdk_font;
   
+#ifdef USE_I18N
+  bufsize = strlen(font->fontname_x11)+12;  /* Should be enought*/
+  buffer = g_new(char,bufsize);
+  g_snprintf(buffer, bufsize, font->fontname_x11, height, height);
+  gdk_font = gdk_fontset_load(buffer);
+#else
   bufsize = strlen(font->fontname_x11)+6;  /* Should be enought*/
   buffer = (char *)malloc(bufsize);
   g_snprintf(buffer, bufsize, font->fontname_x11, height);
   gdk_font = gdk_font_load(buffer);
+#endif
   free(buffer);
 
   return gdk_font;
@@ -536,6 +830,26 @@
   return cache_item->suck_font;
 }
 
+#ifdef USE_I18N
+char *
+font_get_psfontname_mb(Font *font)
+{
+  FontPrivate *fontprivate;
+
+  fontprivate = (FontPrivate *)font;
+  
+  return fontprivate->fontname_ps[1];
+}
+char *
+font_get_psfontname(Font *font)
+{
+  FontPrivate *fontprivate;
+
+  fontprivate = (FontPrivate *)font;
+  
+  return fontprivate->fontname_ps[0];
+}
+#else
 char *
 font_get_psfontname(Font *font)
 {
@@ -545,6 +859,7 @@
   
   return fontprivate->fontname_ps;
 }
+#endif
 
 real
 font_string_width(const char *string, Font *font, real height)
Index: dia/dia-0.88.1/lib/font.h
diff -u dia/dia-0.88.1/lib/font.h:1.1.1.1 dia/dia-0.88.1/lib/font.h:1.3
--- dia/dia-0.88.1/lib/font.h:1.1.1.1	Mon Sep 24 10:42:06 2001
+++ dia/dia-0.88.1/lib/font.h	Wed Oct  3 21:15:44 2001
@@ -61,6 +61,9 @@
 GdkFont *font_get_gdkfont(Font *font, int height);
 SuckFont *font_get_suckfont(Font *font, int height);
 char *font_get_psfontname(Font *font);
+#ifdef USE_I18N 
+char *font_get_psfontname_mb(Font *font);
+#endif
 real font_string_width(const char *string, Font *font, real height);
 real font_ascent(Font *font, real height);
 real font_descent(Font *font, real height);
Index: dia/dia-0.88.1/lib/text.c
diff -u dia/dia-0.88.1/lib/text.c:1.1.1.1 dia/dia-0.88.1/lib/text.c:1.2.4.1
--- dia/dia-0.88.1/lib/text.c:1.1.1.1	Mon Sep 24 10:42:06 2001
+++ dia/dia-0.88.1/lib/text.c	Sun Oct 14 02:18:44 2001
@@ -55,6 +55,100 @@
 static ObjectChange *text_create_change(Text *text, enum change_type type,
 					char ch, int pos, int row);
 
+#ifdef USE_I18N
+static int
+text_string_length(const char *text) {
+  GdkWChar *wc;
+  int wclen;
+
+  wc = (GdkWChar *)g_malloc(sizeof(GdkWChar) * strlen(text));
+  wclen = gdk_mbstowcs(wc, text, strlen(text));
+
+  g_free(wc);
+  return wclen;
+}
+static int
+text_substring_length(const char *srctext, int pos) {
+  /* retrun the substring length, text(0,pos). */
+  char *text;
+  GdkWChar *wc;
+  int wclen;
+
+  if (pos < 0) {
+    return 0;
+  }
+  if (pos > strlen(srctext)) {
+    return strlen(srctext) - 1;
+  }
+
+  text = g_new(char, pos+1);
+
+  strncpy(text, srctext, pos);
+  text[pos] = '\0';
+
+  wc = g_new(GdkWChar, pos + 1);
+  /*
+  while((wclen = gdk_mbstowcs(wc, text, pos+1)) < 0) {
+    fprintf(stderr, "text_substring_length: (inc) wclen = %d\n", wclen);
+  }
+  */
+  wclen = gdk_mbstowcs(wc, text, pos+1);
+
+  g_free(wc);
+  g_free(text);
+
+  return wclen;
+}
+static int
+text_mbchar_length(const char *text, int pos, int direc) {
+  GdkWChar *wc;
+  int subwclen;
+  char *s,*e;
+  int start_pos, end_pos;
+
+  if (direc) { /* direc != 0 means to return the right side char size */
+    if (pos >= strlen(text)) {
+      return 1;
+    }
+  } else {
+      if (pos <= 0) {
+	return 1;
+      }
+  }
+
+  wc = g_new(GdkWChar, strlen(text)+1);
+  gdk_mbstowcs(wc, text, strlen(text)+1);
+
+  while((subwclen = text_substring_length(text, pos)) < 0) {
+    pos--;
+  }
+
+  if (direc) { /* to measure right side char size */
+    wc[subwclen+1] = '\0';
+    s = gdk_wcstombs(wc);
+    start_pos = strlen(s);
+
+    wc[subwclen] = '\0';
+    e = gdk_wcstombs(wc);
+    end_pos = strlen(e);
+  } else {
+    wc[subwclen] = '\0';
+    s = gdk_wcstombs(wc);
+    start_pos = strlen(s);
+
+    wc[subwclen-1] = '\0';
+    e = gdk_wcstombs(wc);
+    end_pos = strlen(e);
+  }
+
+  g_free(s);
+  g_free(e);
+  g_free(wc);
+
+  return start_pos - end_pos;
+}
+#endif
+
 static void
 calc_width(Text *text)
 {
@@ -98,6 +192,14 @@
 
   g_free(text->row_width);
   text->row_width = NULL;
+
+#ifdef USE_I18N
+  for (i=0;i<text->numlines;i++) {
+    g_free(text->wcline[i]);
+  }
+  g_free(text->wcline);
+  text->wcline = NULL;
+#endif
 }
 
 static void
@@ -122,12 +224,19 @@
   text->strlen = g_malloc(sizeof(int)*numlines);
   text->alloclen = g_malloc(sizeof(int)*numlines);
   text->row_width = g_malloc(sizeof(real)*numlines);
+#ifdef USE_I18N
+  text->wcline = g_malloc(sizeof(GdkWChar *)*numlines);
+#endif
 
   s = string;
 
   if (string==NULL) {
     text->line[0] = (char *)g_malloc(1);
     text->line[0][0] = 0;
+#ifdef USE_I18N
+    text->wcline[0] = g_new(GdkWChar, 1);
+    text->wcline[0][0] = 0;
+#endif
     text->strlen[0] = 0;
     text->alloclen[0] = 1;
     return;
@@ -145,6 +254,11 @@
     text->alloclen[i] = len+1;
     strncpy(text->line[i], s, len);
     text->line[i][len] = 0; /* end line with \0 */
+#ifdef USE_I18N
+    text->wcline[i] = g_new(GdkWChar, len+1);
+    text->cursor_real_pos = gdk_mbstowcs(text->wcline[i], s, len);
+    text->wcline[i][len] = 0;
+#endif
     s = s2+1;
   }
 
@@ -185,6 +299,9 @@
 
   text->cursor_pos = 0;
   text->cursor_row = 0;
+#ifdef USE_I18N
+  text->cursor_real_pos = 0;
+#endif
   
   text->focus.obj = NULL;
   text->focus.has_focus = FALSE;
@@ -211,12 +328,20 @@
   copy->strlen = g_malloc(sizeof(int)*copy->numlines);
   copy->alloclen = g_malloc(sizeof(int)*copy->numlines);
   copy->row_width = g_malloc(sizeof(real)*copy->numlines);
+#ifdef USE_I18N
+  copy->wcline = g_malloc(sizeof(GdkWChar *)*copy->numlines);
+#endif
   
   for (i=0;i<text->numlines;i++) {
     copy->line[i] = (char *)g_malloc(text->strlen[i]+1);
     strcpy(copy->line[i], text->line[i]);
     copy->strlen[i] = text->strlen[i];
     copy->alloclen[i] = text->strlen[i]+1;
+#ifdef USE_I18N
+    copy->wcline[i] = (GdkWChar *)g_malloc(sizeof(GdkWChar)*(text->strlen[i]+1));
+    copy->cursor_real_pos = gdk_mbstowcs(text->wcline[i], text->line[i], text->strlen[i]);
+    copy->wcline[i][copy->cursor_real_pos] = 0;
+#endif
   }
   
   copy->font = text->font;
@@ -512,6 +637,13 @@
       renderer->interactive_ops->get_text_width(renderer, text->line[row], i);
     if (clicked_point->x - start_x >= str_width_first) {
       text->cursor_pos = i;
+#ifdef USE_I18N
+      /* is it right? */
+      while(text_substring_length(text->line[text->cursor_row], 
+				  text->cursor_pos) < 0) {
+	text->cursor_pos--;
+      }
+#endif
     } else {
       return;
     }
@@ -574,6 +706,44 @@
 static void
 text_delete_forward(Text *text)
 {
+#ifdef USE_I18N
+  int row;
+  int i;
+  real width;
+  GdkWChar *wc;
+  int wclen;
+  
+  row = text->cursor_row;
+  
+  if (text->cursor_pos >= text->strlen[row]) {
+    if (row+1 < text->numlines)
+      text_join_lines(text, row);
+    return;
+  }
+  wc = g_new(GdkWChar, strlen(text->line[row])+1);
+  wclen = gdk_mbstowcs(wc, text->line[row], text_string_length(text->line[row]));
+  text->cursor_real_pos = text_substring_length(text->line[row], text->cursor_pos);
+  g_memmove(wc + text->cursor_real_pos,
+	    wc + text->cursor_real_pos + 1,
+	    (wclen - text->cursor_real_pos) * sizeof(GdkWChar));
+  wc[wclen-1] = '\0';
+
+  g_free(text->line[row]);
+  text->line[row] = gdk_wcstombs(wc);
+  text->strlen[row] = strlen(text->line[row]);
+  
+  if (text->cursor_pos > text->strlen[text->cursor_row])
+    text->cursor_pos = text->strlen[text->cursor_row];
+
+  text->row_width[row] = font_string_width(text->line[row], text->font, text->height);
+  width = 0.0;
+  for (i=0;i<text->numlines;i++) {
+    width = MAX(width, text->row_width[i]);
+  }
+  text->max_width = width;
+
+  g_free(wc);
+#else
   int row;
   int i;
   real width;
@@ -600,6 +770,7 @@
     width = MAX(width, text->row_width[i]);
   }
   text->max_width = width;
+#endif
 }
 
 static void
@@ -608,6 +779,11 @@
   int row;
   int i;
   real width;
+#ifdef USE_I18N
+  GdkWChar *wc;
+  gint wclen;
+  gint textlen;
+#endif
   
   row = text->cursor_row;
   
@@ -616,6 +792,23 @@
       text_join_lines(text, row-1);
     return;
   }
+#ifdef USE_I18N
+  textlen = strlen(text->line[row]);
+  wc = g_new(GdkWChar, strlen(text->line[row])+1);
+  wclen = gdk_mbstowcs(wc, text->line[row], text_string_length(text->line[row]));
+  text->cursor_real_pos = text_substring_length(text->line[row], text->cursor_pos);
+  g_memmove(wc + text->cursor_real_pos - 1,
+	    wc + text->cursor_real_pos,
+	    (wclen - text->cursor_real_pos) * sizeof(GdkWChar));
+  wc[wclen-1] = '\0';
+
+  g_free(text->line[row]);
+  text->line[row] = gdk_wcstombs(wc);
+  text->strlen[row] = strlen(text->line[row]);
+
+  /* if delete a single byte, text->cursor_pos -= 1; */
+  text->cursor_pos -= textlen - text->strlen[row]; 
+#else
   memmove(text->line[row] + text->cursor_pos - 1,
 	  text->line[row] + text->cursor_pos,
 	  text->strlen[row] - text->cursor_pos + 1);
@@ -623,6 +816,7 @@
   text->strlen[row]--;
 
   text->cursor_pos --;
+#endif
   
   if (text->cursor_pos > text->strlen[text->cursor_row])
     text->cursor_pos = text->strlen[text->cursor_row];
@@ -743,6 +937,12 @@
     if (text->cursor_row<0)
       text->cursor_row = 0;
 
+#ifdef USE_I18N
+    while(text_substring_length(text->line[text->cursor_row], 
+			    text->cursor_pos) < 0) {
+      text->cursor_pos--;
+    }
+#endif
     if (text->cursor_pos > text->strlen[text->cursor_row])
       text->cursor_pos = text->strlen[text->cursor_row];
 
@@ -752,17 +952,33 @@
     if (text->cursor_row >= text->numlines)
       text->cursor_row = text->numlines - 1;
 
+#ifdef USE_I18N
+    while(text_substring_length(text->line[text->cursor_row], 
+			    text->cursor_pos) < 0) {
+      text->cursor_pos--;
+    }
+#endif
     if (text->cursor_pos > text->strlen[text->cursor_row])
       text->cursor_pos = text->strlen[text->cursor_row];
     
     break;
   case GDK_Left:
+#ifdef USE_I18N
+    text->cursor_pos -= text_mbchar_length(text->line[text->cursor_row], 
+					   text->cursor_pos, 0);
+#else
     text->cursor_pos--;
+#endif
     if (text->cursor_pos<0)
       text->cursor_pos = 0;
     break;
   case GDK_Right:
+#ifdef USE_I18N
+    text->cursor_pos += text_mbchar_length(text->line[text->cursor_row], 
+					   text->cursor_pos, 1);
+#else
     text->cursor_pos++;
+#endif
     if (text->cursor_pos > text->strlen[text->cursor_row])
       text->cursor_pos = text->strlen[text->cursor_row];
     break;
Index: dia/dia-0.88.1/lib/text.h
diff -u dia/dia-0.88.1/lib/text.h:1.1.1.1 dia/dia-0.88.1/lib/text.h:1.2
--- dia/dia-0.88.1/lib/text.h:1.1.1.1	Mon Sep 24 10:42:06 2001
+++ dia/dia-0.88.1/lib/text.h	Sun Sep 30 15:00:22 2001
@@ -44,6 +44,10 @@
   int cursor_pos;
   int cursor_row;
   Focus focus;
+#ifdef USE_I18N
+  GdkWChar **wcline;
+  int cursor_real_pos;
+#endif
   
   /* Computed values:  */
   real ascent;
Index: dia/dia-0.88.1/objects/UML/class.c
diff -u dia/dia-0.88.1/objects/UML/class.c:1.1.1.1 dia/dia-0.88.1/objects/UML/class.c:1.2
--- dia/dia-0.88.1/objects/UML/class.c:1.1.1.1	Mon Sep 24 10:42:07 2001
+++ dia/dia-0.88.1/objects/UML/class.c	Sun Sep 30 15:00:22 2001
@@ -502,17 +502,29 @@
   }
   if (umlclass->stereotype != NULL) {
     umlclass->namebox_height += font_height;
+#ifdef USE_I18N
+    umlclass->stereotype_string =
+      g_malloc(sizeof(char)*(strlen(umlclass->stereotype)+4+1));
+
+    strncpy(umlclass->stereotype_string, UML_STEREOTYPE_START, 2);
+    umlclass->stereotype_string[2] = '\0';
+#else
     umlclass->stereotype_string =
       g_malloc(sizeof(char)*(strlen(umlclass->stereotype)+2+1));
     
     umlclass->stereotype_string[0] = UML_STEREOTYPE_START;
     umlclass->stereotype_string[1] = 0;
+#endif
     
     strcat(umlclass->stereotype_string, umlclass->stereotype);
 
+#ifdef USE_I18N
+    strncat(umlclass->stereotype_string, UML_STEREOTYPE_END, 2);
+#else
     i = strlen(umlclass->stereotype_string);
     umlclass->stereotype_string[i] = UML_STEREOTYPE_END;
     umlclass->stereotype_string[i+1] = 0;
+#endif
     
     width = font_string_width(umlclass->stereotype_string, umlclass->normal_font, font_height);
     maxwidth = MAX(width, maxwidth);
Index: dia/dia-0.88.1/objects/UML/object.c
diff -u dia/dia-0.88.1/objects/UML/object.c:1.1.1.1 dia/dia-0.88.1/objects/UML/object.c:1.2
--- dia/dia-0.88.1/objects/UML/object.c:1.1.1.1	Mon Sep 24 10:42:07 2001
+++ dia/dia-0.88.1/objects/UML/object.c	Sun Sep 30 15:00:22 2001
@@ -725,12 +725,21 @@
   str = gtk_entry_get_text(prop_dialog->stereotype);
   
   if (strlen(str) != 0) {
+#ifdef USE_I18N
+    ob->stereotype = g_malloc(sizeof(char)*strlen(str)+4+1);
+	strncpy(ob->stereotype, UML_STEREOTYPE_START, 2);
+#else /* !USE_I18N */
     ob->stereotype = g_malloc(sizeof(char)*strlen(str)+2+1);
     ob->stereotype[0] = UML_STEREOTYPE_START;
     ob->stereotype[1] = 0;
+#endif /* !USE_I18N */
     strcat(ob->stereotype, str);
+#ifdef USE_I18N
+    strncat(ob->stereotype, UML_STEREOTYPE_END, 2);
+#else /* !USE_I18N */
     ob->stereotype[strlen(str)+1] = UML_STEREOTYPE_END;
     ob->stereotype[strlen(str)+2] = 0;
+#endif /* !USE_I18N */
   } else {
     ob->stereotype = NULL;
   }
Index: dia/dia-0.88.1/objects/UML/stereotype.c
diff -u dia/dia-0.88.1/objects/UML/stereotype.c:1.1.1.1 dia/dia-0.88.1/objects/UML/stereotype.c:1.2
--- dia/dia-0.88.1/objects/UML/stereotype.c:1.1.1.1	Mon Sep 24 10:42:07 2001
+++ dia/dia-0.88.1/objects/UML/stereotype.c	Sun Sep 30 15:00:22 2001
@@ -47,8 +47,13 @@
   return str;
 }
 
+#ifdef USE_I18N
+char *uml_start_bracket = UML_STEREOTYPE_START;
+char *uml_end_bracket = UML_STEREOTYPE_END;
+#else
 char uml_start_bracket[] = {(char)UML_STEREOTYPE_START, '\0'};
 char uml_end_bracket[] = {(char)UML_STEREOTYPE_END, '\0'};
+#endif
 
 char *
 string_to_stereotype(char *str) {
@@ -57,6 +62,10 @@
 
 char *
 stereotype_to_string(char *stereotype) {
+#ifdef USE_I18N
+  return bracketted_to_string(stereotype, 2);
+#else /* !USE_I18N */
   return bracketted_to_string(stereotype, 1);
+#endif /* !USE_I18N */
 }
 
Index: dia/dia-0.88.1/objects/UML/uml.h
diff -u dia/dia-0.88.1/objects/UML/uml.h:1.1.1.1 dia/dia-0.88.1/objects/UML/uml.h:1.2
--- dia/dia-0.88.1/objects/UML/uml.h:1.1.1.1	Mon Sep 24 10:42:07 2001
+++ dia/dia-0.88.1/objects/UML/uml.h	Sun Sep 30 15:00:22 2001
@@ -77,8 +77,13 @@
 };
 
 /* Characters used to start/end stereotypes: */
+#ifdef USE_I18N
+#define UML_STEREOTYPE_START "<<"
+#define UML_STEREOTYPE_END ">>"
+#else
 #define UML_STEREOTYPE_START ((char) 171)
 #define UML_STEREOTYPE_END ((char) 187)
+#endif
 
 extern char *uml_get_attribute_string(UMLAttribute *attribute);
 extern char *uml_get_operation_string(UMLOperation *operation);
Index: dia/dia-0.88.1/po/ja.gmo
Index: dia/dia-0.88.1/po/ja.po
diff -u dia/dia-0.88.1/po/ja.po:1.1.1.1 dia/dia-0.88.1/po/ja.po:1.2
--- dia/dia-0.88.1/po/ja.po:1.1.1.1	Mon Sep 24 10:42:06 2001
+++ dia/dia-0.88.1/po/ja.po	Wed Oct  3 21:15:44 2001
@@ -1040,7 +1040,7 @@
 
 #: app/menus.c:307
 msgid "/View/Diagram Properties"
-msgstr "/����������(_D)/�ץ��ѥƥ�(_P)"
+msgstr "/ɽ��(_V)/�ץ��ѥƥ�(_P)"
 
 #: app/menus.c:309
 msgid "/View/_AntiAliased"
