diff -uNr dia-0.84-1/README.ja dia-0.84-5/README.ja
--- dia-0.84-1/README.ja	Thu Jan  1 09:00:00 1970
+++ dia-0.84-5/README.ja	Mon Mar 27 14:10:01 2000
@@ -0,0 +1,36 @@
+Current Patch for dia-0.8x is at;
+	http://www.u-aizu.ac.jp/%7Em5031201/dia/ (master)
+	http://europa.u-aizu.ac.jp/%7Eyasu/dia/ (mirror)
+(please refer;  http://www2.famille.ne.jp/~mituiwa/)
+
+*** dia-0.84ÆüËÜ¸ì²½¥Ñ¥Ã¥Á¤Ë¤Ä¤¤¤Æ ***
+dia-0.8x¤ÎÆüËÜ¸ì²½¥Ñ¥Ã¥Á¤Ë¤Ä¤¤¤Æ¤Ï¡¢http://www2.famille.ne.jp/~mituiwa/
+¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£»ä¤¬¹Ô¤Ê¤Ã¤¿ºî¶È¤Ç¤Ï¥ª¥ê¥¸¥Ê¥ë¤Î¥³¡¼¥É¤ò»Ä¤·¤Ê¤¬¤é
+ºî¶È¤ò¿Ê¤á¤ë¤¿¤á¤Ëconfig.h¤Ç"JAPANESE"¤òÄêµÁ¤·¤Æ¤¤¤Þ¤¹¡£
+¤ß¤Ä¤¤¤ï¤µ¤ó¤¬dia-0.82ÍÑ¤ËºÇ½é¤ËºîÀ®¤µ¤ì¤¿XIMÂÐ±þ¥Ñ¥Ã¥Á(dia-0.82-jp1.diff)
+¤òdia-0.84¤ËÂÐ±þ¤·¤¿dia-0.84-0-1.diff¤¬»ä¤ÎWeb¥Ú¡¼¥¸¤«¤éÆþ¼ê¤Ç¤­¤Þ¤¹¡£
+
+»ä¤Ï°Ê²¼¤Î¸Ä½ê¤Ë¤Ä¤¤¤Æ¥³¡¼¥É¤ÎÊÑ¹¹¡¢ÄÉ²Ã¤ò¹Ô¤Ê¤¤¤Þ¤·¤¿¡£
+	¡¦EPS½ÐÎÏ¤Ç¤Îascii, EUCº®ºß¥Æ¥­¥¹¥È¤ÎÂÐ±þ
+	¡¦PNG½ÐÎÏ¤Ç¤ÎEUCÂÐ±þ
+	¡¦¥Æ¥­¥¹¥È¤Îºï½ü¡¢¥«¡¼¥½¥ë°ÜÆ°¤Ç¤Î2¥Ð¥¤¥ÈÊ¸»úÂÐ±þ
+	¡¦Roman-Italic¤Ê¤É¤Î±Ñ»úfont»ØÄê»þ¤ÎÆüËÜ¸ìÉ½¼¨¤ÎÂÐ±þ
+
+¤Þ¤¿°ðÃÏ¤µ¤ó¤ÎUML¥¯¥é¥¹¿Þ¤Î¥¹¥Æ¥ì¥ª¥¿¥¤¥×ÉÁ²è¤ËÂÐ¤¹¤ë¥Ñ¥Ã¥Á¤Î¼è¤ê¹þ¤ß¤¬
+¹Ô¤Ê¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
+
+*** ¥¤¥ó¥¹¥È¡¼¥ë ***
+tar xvzf dia-0.84.tar.gz
+cd dia-0.84/
+patch -p1 < dia-0.84-0-1.diff
+patch -p1 < dia-0.84-1-5.diff
+env LINGUAS=ja ./configure
+make
+make install
+
+*** Ãøºî¸¢ ***
+»ä¤¬ºîÀ®¤·¤¿dia-0.84¤Ø¤Î¥³¡¼¥É¤Ë¤Ä¤¤¤Æ¤Ïdia-0.84¥ª¥ê¥¸¥Ê¥ë¤Î
+Ãøºî¸¢É½µ­¤Ë½¾¤Ã¤Æ¼«Í³¤ËÊÑ¹¹¡¢ÇÛÉÛ¤¬¤Ç¤­¤Þ¤¹¡£
+
+*** Ï¢ÍíÀè ***
+e-mail: m5031201@u-aizu.ac.jp
diff -uNr dia-0.84-1/acconfig.h dia-0.84-5/acconfig.h
--- dia-0.84-1/acconfig.h	Sun Feb 27 20:21:00 2000
+++ dia-0.84-5/acconfig.h	Mon Mar 27 12:49:53 2000
@@ -54,6 +54,11 @@
 /* Define as 1 if you have gettext and don't want to use GNU gettext.  */
 #undef HAVE_GETTEXT
 
+/* for Japanese EPS & PNG Output Support*/
+#undef JAPANESE
+
+/* for XIM Support */
+#undef USE_XIM
 
 
 /* Leave that blank line there!!  Autoheader needs it.
diff -uNr dia-0.84-1/app/Makefile.in dia-0.84-5/app/Makefile.in
--- dia-0.84-1/app/Makefile.in	Mon Mar 27 12:13:20 2000
+++ dia-0.84-5/app/Makefile.in	Mon Mar 27 12:48:34 2000
@@ -142,7 +142,7 @@
 PROGRAMS =  $(bin_PROGRAMS) $(noinst_PROGRAMS)
 
 
-DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DUSE_XIM
+DEFS = @DEFS@ -I. -I$(srcdir) -I..
 LIBS = @LIBS@
 @HAVE_GNOME_PRINT_TRUE@dia_OBJECTS =  connectionpoint_ops.o diagram.o \
 @HAVE_GNOME_PRINT_TRUE@commands.o app_procs.o preferences.o load_save.o \
diff -uNr dia-0.84-1/app/render_eps.c dia-0.84-5/app/render_eps.c
--- dia-0.84-1/app/render_eps.c	Mon Mar 27 12:13:20 2000
+++ dia-0.84-5/app/render_eps.c	Mon Mar 27 12:48:34 2000
@@ -26,6 +26,13 @@
 #include "message.h"
 #include "diagramdata.h"
 
+#ifdef JAPANESE
+void local_draw_string(RendererEPS *renderer,
+			  const char *text,
+			  Point *pos, Alignment alignment,
+			  Color *color);
+#endif
+
 static void begin_render(RendererEPS *renderer, DiagramData *data);
 static void end_render(RendererEPS *renderer);
 static void set_linewidth(RendererEPS *renderer, real linewidth);
@@ -718,13 +725,14 @@
 static void
 set_font(RendererEPS *renderer, Font *font, real height)
 {
-  char *str;
-
-  str = font_get_psfontname(font);
-  if(strcmp(str, "Ryumin-Light") != 0)
-    fprintf(renderer->file, "/%s-latin1 ff %f scf sf\n", str, (double)height);
-  else
-    fprintf(renderer->file, "/%s-EUC-H ff %f scf sf\n", str, (double)height);
+#ifdef JAPANESE
+  /* keep properties into renderer object */
+  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
 }
 
 static void
@@ -968,11 +976,19 @@
   fprintf(renderer->file, " f\n");
 }
 
+#ifdef JAPANESE
+void
+local_draw_string(RendererEPS *renderer,
+	    const char *text,
+	    Point *pos, Alignment alignment,
+	    Color *color)
+#else
 static void
 draw_string(RendererEPS *renderer,
 	    const char *text,
 	    Point *pos, Alignment alignment,
 	    Color *color)
+#endif
 {
   char *buffer;
   const char *str;
@@ -1017,6 +1033,71 @@
   
   fprintf(renderer->file, " gs 1 -1 sc sh gr\n");
 }
+
+#ifdef JAPANESE
+static void
+draw_string(RendererEPS *renderer,
+	    const char *text,
+	    Point *pos, Alignment alignment,
+	    Color *color)
+{
+  Point _pos;
+  int i;
+  int s;
+  char *buff;
+ 
+  _pos = *pos;
+  if(alignment == ALIGN_RIGHT) {
+    _pos.x -= font_string_width(text, renderer->font, renderer->font_height);
+    alignment = ALIGN_LEFT;
+  } else if (alignment == ALIGN_CENTER) {
+    _pos.x -= font_string_width(text, renderer->font, renderer->font_height) / 2;
+    alignment = ALIGN_LEFT;
+  }
+  buff = (char *)g_malloc(sizeof(char) * strlen(text) + 1);
+  for(i=0, s=0; i<strlen(text);i++,s++) {
+    if(s==0) {
+      buff[s] = text[i];
+    } else if (text[i-1] < 0 && text[i] < 0) {
+      /* both are 16bits char */
+      buff[s] = text[i];
+    } else if (text[i-1] > 0 && text[i] > 0) {
+      /* for ASCII char */
+      buff[s] = text[i];
+    } else {
+      /* 'text->line[i][j]' is a boundary between single and double chars */
+      if (text[i-1] > 0) {
+ 	/* printing ASCII chars */
+	fprintf(renderer->file, "/%s-latin1 ff %f scf sf\n", font_get_psfontname(renderer->font)[0], (double)renderer->font_height);
+      } else {
+ 	/* printging 16bits chars */
+	fprintf(renderer->file, "/%s-EUC-H ff %f scf sf\n", font_get_psfontname(renderer->font)[1], (double)renderer->font_height);
+      }
+      buff[s] = '\0';
+      local_draw_string(renderer,
+ 		  buff,
+ 		  &_pos, alignment,
+ 		  color);
+      _pos.x += font_string_width(buff, renderer->font, renderer->font_height);
+      s = 0;
+      buff[s] = text[i];
+    }
+  }
+  if (text[i-1] > 0) {
+    /* printing ASCII chars */
+    fprintf(renderer->file, "/%s-latin1 ff %f scf sf\n", font_get_psfontname(renderer->font)[0], (double)renderer->font_height);
+  } else {
+    /* printging 16bits chars */
+    fprintf(renderer->file, "/%s-EUC-H ff %f scf sf\n", font_get_psfontname(renderer->font)[1], (double)renderer->font_height);
+  }
+  buff[s] = '\0';
+  local_draw_string(renderer,
+ 	      buff,
+	      &_pos, alignment,
+ 	      color);
+  g_free(buff);
+}
+#endif
 
 static void
 draw_image(RendererEPS *renderer,
diff -uNr dia-0.84-1/app/render_eps.h dia-0.84-5/app/render_eps.h
--- dia-0.84-1/app/render_eps.h	Mon Dec 20 21:22:02 1999
+++ dia-0.84-5/app/render_eps.h	Mon Mar 27 12:48:34 2000
@@ -37,6 +37,11 @@
   LineStyle saved_line_style;
   real dash_length;
   real dot_length;
+
+#ifdef JAPANESE
+  Font *font;
+  real font_height;
+#endif
 };
 
 extern RendererEPS *new_eps_renderer(Diagram *dia, char *filename);
diff -uNr dia-0.84-1/app/render_gnomeprint.c dia-0.84-5/app/render_gnomeprint.c
--- dia-0.84-1/app/render_gnomeprint.c	Mon Oct 25 14:59:43 1999
+++ dia-0.84-5/app/render_gnomeprint.c	Mon Mar 27 12:48:34 2000
@@ -290,7 +290,11 @@
 
   if (renderer->font)
     gtk_object_unref(GTK_OBJECT(renderer->font));
-  gfont = gnome_font_new(font_get_psfontname(font), height);
+#ifdef JAPANESE
+  gfont = gnome_font_new (font_get_psfontname(font)[0], height);
+#else
+  gfont = gnome_font_new (font_get_psfontname(font), height);
+#endif
   if (!gfont)
     gfont = gnome_font_new("Courier", height);
   gnome_print_setfont(renderer->ctx, gfont);
diff -uNr dia-0.84-1/app/render_libart.c dia-0.84-5/app/render_libart.c
--- dia-0.84-1/app/render_libart.c	Wed Feb  9 11:20:32 2000
+++ dia-0.84-5/app/render_libart.c	Mon Mar 27 12:48:34 2000
@@ -1107,6 +1107,92 @@
   art_svp_free( svp );
 }
 
+#ifdef JAPANESE
+SuckFont *
+get_suck_font (GdkFont *font, guchar *sentence)
+{
+  SuckFont *suckfont;
+  int x, y;
+  char text[2];
+  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,
@@ -1121,6 +1207,9 @@
   SuckFont *suckfont;
   double xpos, ypos;
   guint32 rgba;
+#ifdef JAPANESE
+  SuckChar *ch;
+#endif
 
   ddisplay_transform_coords(ddisp, pos->x, pos->y,
 			    &x, &y);
@@ -1137,7 +1226,11 @@
     break;
   }
 
+#ifdef JAPANESE
+  suckfont = get_suck_font(renderer->gdk_font, text);
+#else
   suckfont = renderer->suck_font;
+#endif
 
   xpos = (double) x + 1; 
   ypos = (double) (y - suckfont->ascent);
@@ -1145,6 +1238,22 @@
   rgba = color_to_rgba(color);
   
   len = strlen(text);
+#ifdef JAPANESE
+  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;
     
@@ -1166,9 +1275,7 @@
     dx = ch->left_sb + ch->width + ch->right_sb;
     xpos += dx;
   }
-
-  
-  
+#endif
 }
 
 static void
diff -uNr dia-0.84-1/config.h.in dia-0.84-5/config.h.in
--- dia-0.84-1/config.h.in	Sun Feb 27 20:25:03 2000
+++ dia-0.84-5/config.h.in	Mon Mar 27 12:56:25 2000
@@ -72,6 +72,12 @@
 /* Define as 1 if you have gettext and don't want to use GNU gettext.  */
 #undef HAVE_GETTEXT
 
+/* for Japanese EPS & PNG Output Support*/
+#undef JAPANESE
+
+/* for XIM Support */
+#undef USE_XIM
+
 /* Define if you have the __argz_count function.  */
 #undef HAVE___ARGZ_COUNT
 
diff -uNr dia-0.84-1/configure dia-0.84-5/configure
--- dia-0.84-1/configure	Tue Feb 29 10:55:24 2000
+++ dia-0.84-5/configure	Mon Mar 27 12:56:20 2000
@@ -37,6 +37,10 @@
 ac_help="$ac_help
   --enable-debug=[no/minimum/yes] turn on debugging [default=minimum]"
 ac_help="$ac_help
+  --enable-japanese=[no/yes] enable Japanese support [default=yes]"
+ac_help="$ac_help
+  --enable-xim=[no/yes] enable XIM support [default=yes]"
+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"
@@ -590,7 +594,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:594: checking for a BSD compatible install" >&5
+echo "configure:598: 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
@@ -643,7 +647,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:647: checking whether build environment is sane" >&5
+echo "configure:651: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -700,7 +704,7 @@
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:704: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:708: 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
@@ -746,7 +750,7 @@
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:750: checking for working aclocal" >&5
+echo "configure:754: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -759,7 +763,7 @@
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:763: checking for working autoconf" >&5
+echo "configure:767: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -772,7 +776,7 @@
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:776: checking for working automake" >&5
+echo "configure:780: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -785,7 +789,7 @@
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:789: checking for working autoheader" >&5
+echo "configure:793: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -798,7 +802,7 @@
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:802: checking for working makeinfo" >&5
+echo "configure:806: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -817,7 +821,7 @@
 
 
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:821: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:825: 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"
@@ -916,7 +920,7 @@
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:920: checking host system type" >&5
+echo "configure:924: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -937,7 +941,7 @@
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:941: checking build system type" >&5
+echo "configure:945: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -957,7 +961,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:961: checking for $ac_word" >&5
+echo "configure:965: 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
@@ -987,7 +991,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:991: checking for $ac_word" >&5
+echo "configure:995: 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
@@ -1017,7 +1021,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:1021: checking for $ac_word" >&5
+echo "configure:1025: 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
@@ -1068,7 +1072,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:1072: checking for $ac_word" >&5
+echo "configure:1076: 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
@@ -1100,7 +1104,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1104: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1108: 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.
@@ -1111,12 +1115,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1115 "configure"
+#line 1119 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1124: \"$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
@@ -1142,12 +1146,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:1146: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1150: 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:1151: checking whether we are using GNU C" >&5
+echo "configure:1155: 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
@@ -1156,7 +1160,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1160: \"$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:1164: \"$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
@@ -1175,7 +1179,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1179: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1183: 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
@@ -1218,7 +1222,7 @@
 if test "$ac_cv_prog_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:1222: checking for ld used by GCC" >&5
+echo "configure:1226: checking for ld used by GCC" >&5
   ac_prog=`($CC -print-prog-name=ld) 2>&5`
   case "$ac_prog" in
     # Accept absolute paths.
@@ -1242,10 +1246,10 @@
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1246: checking for GNU ld" >&5
+echo "configure:1250: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1249: checking for non-GNU ld" >&5
+echo "configure:1253: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1281,7 +1285,7 @@
 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:1285: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1289: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1297,7 +1301,7 @@
 
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1301: checking for BSD-compatible nm" >&5
+echo "configure:1305: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1334,7 +1338,7 @@
 
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1338: checking whether ln -s works" >&5
+echo "configure:1342: 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
@@ -1378,8 +1382,8 @@
 case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 1382 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:1383: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 1386 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:1387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -1400,19 +1404,19 @@
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:1404: checking whether the C compiler needs -belf" >&5
+echo "configure:1408: 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
   cat > conftest.$ac_ext <<EOF
-#line 1409 "configure"
+#line 1413 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1420: \"$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
@@ -1515,7 +1519,7 @@
 
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:1519: checking whether build environment is sane" >&5
+echo "configure:1523: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -1556,7 +1560,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:1560: checking for $ac_word" >&5
+echo "configure:1564: 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
@@ -1586,7 +1590,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:1590: checking for $ac_word" >&5
+echo "configure:1594: 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
@@ -1637,7 +1641,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:1641: checking for $ac_word" >&5
+echo "configure:1645: 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
@@ -1669,7 +1673,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1673: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1677: 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.
@@ -1680,12 +1684,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1684 "configure"
+#line 1688 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1693: \"$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
@@ -1711,12 +1715,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:1715: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1719: 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:1720: checking whether we are using GNU C" >&5
+echo "configure:1724: 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
@@ -1725,7 +1729,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1729: \"$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:1733: \"$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
@@ -1744,7 +1748,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1748: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1752: 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
@@ -1787,7 +1791,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:1791: checking for a BSD compatible install" >&5
+echo "configure:1795: 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
@@ -1840,7 +1844,7 @@
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1844: checking whether ln -s works" >&5
+echo "configure:1848: 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
@@ -1861,7 +1865,7 @@
 fi
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1865: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1869: 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
@@ -1888,7 +1892,7 @@
 fi
 
 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1892: checking for POSIXized ISC" >&5
+echo "configure:1896: checking for POSIXized ISC" >&5
 if test -d /etc/conf/kconfig.d &&
   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
 then
@@ -1959,7 +1963,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:1963: checking for $ac_word" >&5
+echo "configure:1967: 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
@@ -1994,7 +1998,7 @@
 
   min_gtk_version=1.2.0
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:1998: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:2002: checking for GTK - version >= $min_gtk_version" >&5
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
@@ -2017,7 +2021,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 2021 "configure"
+#line 2025 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -2095,7 +2099,7 @@
 }
 
 EOF
-if { (eval echo configure:2099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -2129,7 +2133,7 @@
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 2133 "configure"
+#line 2137 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -2139,7 +2143,7 @@
  return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:2143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2147: \"$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"
@@ -2183,7 +2187,7 @@
 
 
 echo $ac_n "checking whether GNOME specific code should be used""... $ac_c" 1>&6
-echo "configure:2187: checking whether GNOME specific code should be used" >&5
+echo "configure:2191: 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"
@@ -2234,7 +2238,7 @@
 
 
 echo $ac_n "checking for poptSetOtherOptionHelp in -lpopt""... $ac_c" 1>&6
-echo "configure:2238: checking for poptSetOtherOptionHelp in -lpopt" >&5
+echo "configure:2242: 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
@@ -2242,7 +2246,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpopt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2246 "configure"
+#line 2250 "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
@@ -2253,7 +2257,7 @@
 poptSetOtherOptionHelp()
 ; return 0; }
 EOF
-if { (eval echo configure:2257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2261: \"$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
@@ -2278,7 +2282,7 @@
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2282: checking how to run the C preprocessor" >&5
+echo "configure:2286: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2293,13 +2297,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 2297 "configure"
+#line 2301 "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:2303: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2307: \"$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
   :
@@ -2310,13 +2314,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 2314 "configure"
+#line 2318 "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:2320: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2324: \"$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
   :
@@ -2327,13 +2331,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 2331 "configure"
+#line 2335 "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:2337: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2341: \"$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
   :
@@ -2361,17 +2365,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2365: checking for $ac_hdr" >&5
+echo "configure:2369: 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 2370 "configure"
+#line 2374 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2375: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2379: \"$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*
@@ -2403,7 +2407,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:2407: checking for $ac_word" >&5
+echo "configure:2411: 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
@@ -2452,7 +2456,7 @@
 
 png_ok=no
 echo $ac_n "checking for png_read_info in -lpng""... $ac_c" 1>&6
-echo "configure:2456: checking for png_read_info in -lpng" >&5
+echo "configure:2460: 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
@@ -2460,7 +2464,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpng -lz -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2464 "configure"
+#line 2468 "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
@@ -2471,7 +2475,7 @@
 png_read_info()
 ; return 0; }
 EOF
-if { (eval echo configure:2475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2479: \"$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
@@ -2488,17 +2492,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:2492: checking for png.h" >&5
+echo "configure:2496: 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 2497 "configure"
+#line 2501 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2502: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2506: \"$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*
@@ -2527,16 +2531,16 @@
 
 if test "$png_ok" = yes; then
   echo $ac_n "checking for png_structp in png.h""... $ac_c" 1>&6
-echo "configure:2531: checking for png_structp in png.h" >&5
+echo "configure:2535: checking for png_structp in png.h" >&5
   cat > conftest.$ac_ext <<EOF
-#line 2533 "configure"
+#line 2537 "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:2540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   png_ok=yes
 else
@@ -2579,15 +2583,43 @@
 fi
 
 
+# Check whether --enable-japanese or --disable-japanese was given.
+if test "${enable_japanese+set}" = set; then
+  enableval="$enable_japanese"
+  :
+fi
+
+
+if test "$enable_japanese" != "no" ; then
+  cat >> confdefs.h <<\EOF
+#define JAPANESE 1
+EOF
+
+fi
+
+# Check whether --enable-xim or --disable-xim was given.
+if test "${enable_xim+set}" = set; then
+  enableval="$enable_xim"
+  :
+fi
+
+
+if test "$enable_xim" != "no" ; then
+  cat >> confdefs.h <<\EOF
+#define USE_XIM 1
+EOF
+
+fi
+
 
 ALL_LINGUAS="da de en_GB hu no pl sv fr ja pt ru uk"
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2586: checking for ANSI C header files" >&5
+echo "configure:2618: 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 2591 "configure"
+#line 2623 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2595,7 +2627,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2631: \"$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*
@@ -2612,7 +2644,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 2616 "configure"
+#line 2648 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -2630,7 +2662,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 2634 "configure"
+#line 2666 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -2651,7 +2683,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 2655 "configure"
+#line 2687 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2662,7 +2694,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:2666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -2686,12 +2718,12 @@
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2690: checking for working const" >&5
+echo "configure:2722: 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 2695 "configure"
+#line 2727 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2740,7 +2772,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2776: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -2761,21 +2793,21 @@
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2765: checking for inline" >&5
+echo "configure:2797: 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 2772 "configure"
+#line 2804 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:2779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -2801,12 +2833,12 @@
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2805: checking for off_t" >&5
+echo "configure:2837: 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 2810 "configure"
+#line 2842 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2834,12 +2866,12 @@
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2838: checking for size_t" >&5
+echo "configure:2870: 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 2843 "configure"
+#line 2875 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2869,19 +2901,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:2873: checking for working alloca.h" >&5
+echo "configure:2905: 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 2878 "configure"
+#line 2910 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:2885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2917: \"$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
@@ -2902,12 +2934,12 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:2906: checking for alloca" >&5
+echo "configure:2938: 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 2911 "configure"
+#line 2943 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -2935,7 +2967,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:2939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2971: \"$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
@@ -2967,12 +2999,12 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:2971: checking whether alloca needs Cray hooks" >&5
+echo "configure:3003: 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 2976 "configure"
+#line 3008 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -2997,12 +3029,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:3001: checking for $ac_func" >&5
+echo "configure:3033: 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 3006 "configure"
+#line 3038 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3025,7 +3057,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3061: \"$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
@@ -3052,7 +3084,7 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:3056: checking stack direction for C alloca" >&5
+echo "configure:3088: 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
@@ -3060,7 +3092,7 @@
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 3064 "configure"
+#line 3096 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -3079,7 +3111,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:3083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3115: \"$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
@@ -3104,17 +3136,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3108: checking for $ac_hdr" >&5
+echo "configure:3140: 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 3113 "configure"
+#line 3145 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3150: \"$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*
@@ -3143,12 +3175,12 @@
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3147: checking for $ac_func" >&5
+echo "configure:3179: 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 3152 "configure"
+#line 3184 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3171,7 +3203,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3207: \"$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
@@ -3196,7 +3228,7 @@
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:3200: checking for working mmap" >&5
+echo "configure:3232: 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
@@ -3204,7 +3236,7 @@
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 3208 "configure"
+#line 3240 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -3344,7 +3376,7 @@
 }
 
 EOF
-if { (eval echo configure:3348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3380: \"$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
@@ -3372,17 +3404,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3376: checking for $ac_hdr" >&5
+echo "configure:3408: 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 3381 "configure"
+#line 3413 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3418: \"$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*
@@ -3412,12 +3444,12 @@
 strdup __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3416: checking for $ac_func" >&5
+echo "configure:3448: 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 3421 "configure"
+#line 3453 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3440,7 +3472,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3476: \"$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
@@ -3469,12 +3501,12 @@
      for ac_func in stpcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3473: checking for $ac_func" >&5
+echo "configure:3505: 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 3478 "configure"
+#line 3510 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3497,7 +3529,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3533: \"$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
@@ -3531,19 +3563,19 @@
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:3535: checking for LC_MESSAGES" >&5
+echo "configure:3567: 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 3540 "configure"
+#line 3572 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:3547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3579: \"$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
@@ -3564,7 +3596,7 @@
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:3568: checking whether NLS is requested" >&5
+echo "configure:3600: 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"
@@ -3584,7 +3616,7 @@
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:3588: checking whether included gettext is requested" >&5
+echo "configure:3620: 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"
@@ -3603,17 +3635,17 @@
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:3607: checking for libintl.h" >&5
+echo "configure:3639: 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 3612 "configure"
+#line 3644 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3617: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3649: \"$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*
@@ -3630,19 +3662,19 @@
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
-echo "configure:3634: checking for gettext in libc" >&5
+echo "configure:3666: checking for gettext in libc" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3639 "configure"
+#line 3671 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:3646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gettext_libc=yes
 else
@@ -3658,7 +3690,7 @@
 
 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:3662: checking for bindtextdomain in -lintl" >&5
+echo "configure:3694: checking for bindtextdomain in -lintl" >&5
 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3666,7 +3698,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3670 "configure"
+#line 3702 "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
@@ -3677,7 +3709,7 @@
 bindtextdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:3681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3713: \"$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
@@ -3693,12 +3725,12 @@
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
-echo "configure:3697: checking for gettext in libintl" >&5
+echo "configure:3729: checking for gettext in libintl" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-echo "configure:3702: checking for gettext in -lintl" >&5
+echo "configure:3734: checking for gettext in -lintl" >&5
 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3706,7 +3738,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3710 "configure"
+#line 3742 "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
@@ -3717,7 +3749,7 @@
 gettext()
 ; return 0; }
 EOF
-if { (eval echo configure:3721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3753: \"$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
@@ -3756,7 +3788,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:3760: checking for $ac_word" >&5
+echo "configure:3792: 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
@@ -3790,12 +3822,12 @@
 		for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3794: checking for $ac_func" >&5
+echo "configure:3826: 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 3799 "configure"
+#line 3831 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3818,7 +3850,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3854: \"$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
@@ -3845,7 +3877,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:3849: checking for $ac_word" >&5
+echo "configure:3881: 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
@@ -3881,7 +3913,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:3885: checking for $ac_word" >&5
+echo "configure:3917: 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
@@ -3913,7 +3945,7 @@
 fi
 
 		cat > conftest.$ac_ext <<EOF
-#line 3917 "configure"
+#line 3949 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -3921,7 +3953,7 @@
 			       return _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:3925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   CATOBJEXT=.gmo
 		   DATADIRNAME=share
@@ -3944,7 +3976,7 @@
 
         if test "$CATOBJEXT" = "NONE"; then
 	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
-echo "configure:3948: checking whether catgets can be used" >&5
+echo "configure:3980: checking whether catgets can be used" >&5
 	  # Check whether --with-catgets or --without-catgets was given.
 if test "${with_catgets+set}" = set; then
   withval="$with_catgets"
@@ -3957,7 +3989,7 @@
 
 	  if test "$nls_cv_use_catgets" = "yes"; then
 	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
-echo "configure:3961: checking for main in -li" >&5
+echo "configure:3993: checking for main in -li" >&5
 ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3965,14 +3997,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-li  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3969 "configure"
+#line 4001 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:3976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4008: \"$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
@@ -4000,12 +4032,12 @@
 fi
 
 	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
-echo "configure:4004: checking for catgets" >&5
+echo "configure:4036: checking for catgets" >&5
 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4009 "configure"
+#line 4041 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char catgets(); below.  */
@@ -4028,7 +4060,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_catgets=yes"
 else
@@ -4050,7 +4082,7 @@
 	       # Extract the first word of "gencat", so it can be a program name with args.
 set dummy gencat; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4054: checking for $ac_word" >&5
+echo "configure:4086: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4086,7 +4118,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:4090: checking for $ac_word" >&5
+echo "configure:4122: 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
@@ -4123,7 +4155,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:4127: checking for $ac_word" >&5
+echo "configure:4159: 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
@@ -4158,7 +4190,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:4162: checking for $ac_word" >&5
+echo "configure:4194: 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
@@ -4216,7 +4248,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:4220: checking for $ac_word" >&5
+echo "configure:4252: 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
@@ -4250,7 +4282,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:4254: checking for $ac_word" >&5
+echo "configure:4286: 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
@@ -4286,7 +4318,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:4290: checking for $ac_word" >&5
+echo "configure:4322: 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
@@ -4379,7 +4411,7 @@
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:4383: checking for catalogs to be installed" >&5
+echo "configure:4415: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
          case "$ALL_LINGUAS" in
@@ -4407,17 +4439,17 @@
    if test "$CATOBJEXT" = ".cat"; then
      ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:4411: checking for linux/version.h" >&5
+echo "configure:4443: checking for linux/version.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 4416 "configure"
+#line 4448 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4453: \"$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*
@@ -4487,7 +4519,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:4491: checking for $ac_word" >&5
+echo "configure:4523: 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
@@ -4516,7 +4548,7 @@
 if test "$XML_CONFIG" != "" 
 then
   echo $ac_n "checking for libxml >= 1.8.5""... $ac_c" 1>&6
-echo "configure:4520: checking for libxml >= 1.8.5" >&5
+echo "configure:4552: 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
@@ -4572,7 +4604,7 @@
   # Extract the first word of "imlib-config", so it can be a program name with args.
 set dummy imlib-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4576: checking for $ac_word" >&5
+echo "configure:4608: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_IMLIB_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4607,7 +4639,7 @@
 
   min_imlib_version=1.8.2
   echo $ac_n "checking for IMLIB - version >= $min_imlib_version""... $ac_c" 1>&6
-echo "configure:4611: checking for IMLIB - version >= $min_imlib_version" >&5
+echo "configure:4643: checking for IMLIB - version >= $min_imlib_version" >&5
   no_imlib=""
   if test "$IMLIB_CONFIG" = "no" ; then
     no_imlib=yes
@@ -4629,7 +4661,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 4633 "configure"
+#line 4665 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -4669,7 +4701,7 @@
 
 
 EOF
-if { (eval echo configure:4673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -4703,7 +4735,7 @@
           CFLAGS="$CFLAGS $GDK_IMLIB_CFLAGS"
           LIBS="$LIBS $GDK_IMLIB_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 4707 "configure"
+#line 4739 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -4713,7 +4745,7 @@
  return 0; 
 ; return 0; }
 EOF
-if { (eval echo configure:4717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4749: \"$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 IMLIB or finding the wrong"
@@ -4754,12 +4786,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:4758: checking for $ac_hdr that defines DIR" >&5
+echo "configure:4790: 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 4763 "configure"
+#line 4795 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -4767,7 +4799,7 @@
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:4771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -4792,7 +4824,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:4796: checking for opendir in -ldir" >&5
+echo "configure:4828: 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
@@ -4800,7 +4832,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4804 "configure"
+#line 4836 "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
@@ -4811,7 +4843,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:4815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4847: \"$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
@@ -4833,7 +4865,7 @@
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:4837: checking for opendir in -lx" >&5
+echo "configure:4869: 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
@@ -4841,7 +4873,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4845 "configure"
+#line 4877 "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
@@ -4852,7 +4884,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:4856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4888: \"$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
@@ -4875,12 +4907,12 @@
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:4879: checking for ANSI C header files" >&5
+echo "configure:4911: 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 4884 "configure"
+#line 4916 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4888,7 +4920,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4924: \"$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*
@@ -4905,7 +4937,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 4909 "configure"
+#line 4941 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -4923,7 +4955,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 4927 "configure"
+#line 4959 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -4944,7 +4976,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 4948 "configure"
+#line 4980 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -4955,7 +4987,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:4959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -4982,17 +5014,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4986: checking for $ac_hdr" >&5
+echo "configure:5018: 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 4991 "configure"
+#line 5023 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4996: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5028: \"$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*
@@ -5020,12 +5052,12 @@
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:5024: checking for working const" >&5
+echo "configure:5056: 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 5029 "configure"
+#line 5061 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -5074,7 +5106,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -5098,12 +5130,12 @@
 for ac_func in select strcspn strdup strtol snprintf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5102: checking for $ac_func" >&5
+echo "configure:5134: 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 5107 "configure"
+#line 5139 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5126,7 +5158,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5162: \"$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
@@ -5159,18 +5191,18 @@
 
 
   echo $ac_n "checking if C compiler accepts -Wall""... $ac_c" 1>&6
-echo "configure:5163: checking if C compiler accepts -Wall" >&5
+echo "configure:5195: checking if C compiler accepts -Wall" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -Wall"
   cat > conftest.$ac_ext <<EOF
-#line 5167 "configure"
+#line 5199 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 void somefunc() { printf("hello"); }
 ; return 0; }
 EOF
-if { (eval echo configure:5174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -5184,18 +5216,18 @@
 
 
   echo $ac_n "checking if C compiler accepts -Wunused""... $ac_c" 1>&6
-echo "configure:5188: checking if C compiler accepts -Wunused" >&5
+echo "configure:5220: checking if C compiler accepts -Wunused" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -Wunused"
   cat > conftest.$ac_ext <<EOF
-#line 5192 "configure"
+#line 5224 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 void somefunc() { printf("hello"); }
 ; return 0; }
 EOF
-if { (eval echo configure:5199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -5209,18 +5241,18 @@
 
 
   echo $ac_n "checking if C compiler accepts -Winline""... $ac_c" 1>&6
-echo "configure:5213: checking if C compiler accepts -Winline" >&5
+echo "configure:5245: checking if C compiler accepts -Winline" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -Winline"
   cat > conftest.$ac_ext <<EOF
-#line 5217 "configure"
+#line 5249 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 void somefunc() { printf("hello"); }
 ; return 0; }
 EOF
-if { (eval echo configure:5224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -5234,18 +5266,18 @@
 
 
   echo $ac_n "checking if C compiler accepts -Wmissing-prototypes""... $ac_c" 1>&6
-echo "configure:5238: checking if C compiler accepts -Wmissing-prototypes" >&5
+echo "configure:5270: checking if C compiler accepts -Wmissing-prototypes" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -Wmissing-prototypes"
   cat > conftest.$ac_ext <<EOF
-#line 5242 "configure"
+#line 5274 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 void somefunc() { printf("hello"); }
 ; return 0; }
 EOF
-if { (eval echo configure:5249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -5259,18 +5291,18 @@
 
 
   echo $ac_n "checking if C compiler accepts -Wmissing-declarations""... $ac_c" 1>&6
-echo "configure:5263: checking if C compiler accepts -Wmissing-declarations" >&5
+echo "configure:5295: checking if C compiler accepts -Wmissing-declarations" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -Wmissing-declarations"
   cat > conftest.$ac_ext <<EOF
-#line 5267 "configure"
+#line 5299 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 void somefunc() { printf("hello"); }
 ; return 0; }
 EOF
-if { (eval echo configure:5274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5306: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -5287,18 +5319,18 @@
   i?86-pc-*)
     
   echo $ac_n "checking if C compiler accepts -fomit-frame-pointer""... $ac_c" 1>&6
-echo "configure:5291: checking if C compiler accepts -fomit-frame-pointer" >&5
+echo "configure:5323: checking if C compiler accepts -fomit-frame-pointer" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -fomit-frame-pointer"
   cat > conftest.$ac_ext <<EOF
-#line 5295 "configure"
+#line 5327 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 void somefunc() { printf("hello"); }
 ; return 0; }
 EOF
-if { (eval echo configure:5302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -5315,18 +5347,18 @@
 
 
   echo $ac_n "checking if C compiler accepts -finline-functions""... $ac_c" 1>&6
-echo "configure:5319: checking if C compiler accepts -finline-functions" >&5
+echo "configure:5351: checking if C compiler accepts -finline-functions" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -finline-functions"
   cat > conftest.$ac_ext <<EOF
-#line 5323 "configure"
+#line 5355 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 void somefunc() { printf("hello"); }
 ; return 0; }
 EOF
-if { (eval echo configure:5330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -5340,18 +5372,18 @@
 
 
   echo $ac_n "checking if C compiler accepts -fstrict-aliasing""... $ac_c" 1>&6
-echo "configure:5344: checking if C compiler accepts -fstrict-aliasing" >&5
+echo "configure:5376: checking if C compiler accepts -fstrict-aliasing" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -fstrict-aliasing"
   cat > conftest.$ac_ext <<EOF
-#line 5348 "configure"
+#line 5380 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 void somefunc() { printf("hello"); }
 ; return 0; }
 EOF
-if { (eval echo configure:5355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
diff -uNr dia-0.84-1/configure.in dia-0.84-5/configure.in
--- dia-0.84-1/configure.in	Tue Feb 29 10:52:55 2000
+++ dia-0.84-5/configure.in	Mon Mar 27 12:53:54 2000
@@ -127,6 +127,32 @@
 AC_SUBST(DEBUG_FLAGS)
 
 dnl
+dnl Japanese Support
+dnl
+AC_ARG_ENABLE(japanese,
+[  --enable-japanese=[no/yes] enable Japanese support [default=yes]],
+  ,
+  ,enable_japanese="yes")
+
+dnl if test "$enable_japanese" = "yes" ; then
+if test "$enable_japanese" != "no" ; then
+  AC_DEFINE(JAPANESE)
+fi
+
+dnl
+dnl XIM Support
+dnl
+AC_ARG_ENABLE(xim,
+[  --enable-xim=[no/yes] enable XIM support [default=yes]],
+  ,
+  ,enable_xim="yes")
+
+dnl if test "$enable_xim" = "yes" ; then
+if test "$enable_xim" != "no" ; then
+  AC_DEFINE(USE_XIM)
+fi
+
+dnl
 dnl i18n
 dnl
 
diff -uNr dia-0.84-1/dia.keys dia-0.84-5/dia.keys
--- dia-0.84-1/dia.keys	Thu Jan  1 09:00:00 1970
+++ dia-0.84-5/dia.keys	Mon Mar 27 13:39:18 2000
@@ -0,0 +1,5 @@
+
+application/x-dia-diagram:
+	open=dia %f
+	view=dia %f
+	icon-filename=/usr/local/share/pixmaps/dia-diagram.png
diff -uNr dia-0.84-1/lib/font.c dia-0.84-5/lib/font.c
--- dia-0.84-1/lib/font.c	Mon Mar 27 12:13:20 2000
+++ dia-0.84-5/lib/font.c	Mon Mar 27 12:48:34 2000
@@ -49,7 +49,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "config.h"
 #include "intl.h"
 #include "utils.h"
 #include "font.h"
@@ -60,6 +59,10 @@
 
 #define NUM_X11_FONTS 2
 
+#ifdef JAPANESE
+#define NUM_PS_FONTS 2
+#endif
+
 typedef struct _FontPrivate FontPrivate;
 typedef struct  _FontCacheItem FontCacheItem;
 
@@ -73,25 +76,245 @@
   Font public;
   char *fontname_x11;
   char **fontname_x11_vec;
+#ifdef JAPANESE
+  char *fontname_ps[NUM_PS_FONTS];
+#else
   char *fontname_ps;
+#endif
   FontCacheItem *cache[FONTCACHE_SIZE];
   real ascent_ratio, descent_ratio;
 };
 
-
 typedef struct _FontData {
   char *fontname;
+#ifdef JAPANESE
+  char *fontname_ps[NUM_PS_FONTS];
+#else
   char *fontname_ps;
+#endif
   char *fontname_x11[NUM_X11_FONTS]; /* First choice */
 } FontData;
 
 FontData font_data[] = {
+#ifdef JAPANESE
   { "ÌÀÄ«",
-    "Ryumin-Light",
-    { "-misc-fixed-medium-r-normal-*-%d-*-*-*-*-*-jisx0208.1983-0",
-      NULL
+    { "Times-Roman", "Ryumin-Light" },
+    { "-adobe-times-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-times-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Times-Roman",
+    { "Times-Roman", "Ryumin-Light" },
+    { "-adobe-times-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-times-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-%d-*-*-*-*-*-*-*"
     }
   }, 
+  { "Times-Italic",
+    { "Times-Italic", "Ryumin-Light" },
+    { "-adobe-times-medium-i-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-i-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-times-medium-i-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-medium-i-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  }, 
+  { "Times-Bold",
+    { "Times-Bold", "GothicBBB-Medium" },
+    { "-adobe-times-bold-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-times-bold-r-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-bold-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  }, 
+  { "Times-BoldItalic",
+    { "Times-BoldItalic", "GothicBBB-Medium" },
+    { "-adobe-times-bold-i-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-bold-i-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-times-bold-i-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-bold-i-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  }, 
+  { "AvantGarde-Book",
+    { "AvantGarde-Book", NULL },
+    { "-adobe-avantgarde-book-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-schumacher-clean-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "AvantGarde-BookOblique",
+    { "AvantGarde-BookOblique", NULL },
+    { "-adobe-avantgarde-book-o-normal-*-%d-*-*-*-*-*-*-*",
+      "-schumacher-clean-medium-i-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "AvantGarde-Demi",
+    { "AvantGarde-Demi", NULL },
+    { "-adobe-avantgarde-demibold-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-schumacher-clean-bold-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "AvantGarde-DemiOblique",
+    { "AvantGarde-DemiOblique", NULL },
+    { "-adobe-avantgarde-demibold-o-normal-*-%d-*-*-*-*-*-*-*",
+      "-schumacher-clean-bold-i-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Bookman-Light",
+    { "Bookman-Light", NULL },
+    { "-adobe-bookman-light-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-times-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Bookman-LightItalic",
+    { "Bookman-LightItalic", NULL },
+    { "-adobe-bookman-light-i-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-times-medium-i-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Bookman-Demi",
+    { "Bookman-Demi", NULL },
+    { "-adobe-bookman-demibold-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-times-bold-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Bookman-DemiItalic",
+    { "Bookman-DemiItalic", NULL },
+    { "-adobe-bookman-demibold-i-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-times-bold-i-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Courier",
+    { "Courier", "Ryumin-Light" },
+    { "-adobe-courier-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-courier-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Courier-Oblique",
+    { "Courier-Oblique", "Ryumin-Light" },
+    { "-adobe-courier-medium-o-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-courier-medium-o-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Courier-Bold",
+    { "Courier-Bold", "GothicBBB-Medium" },
+    { "-adobe-courier-bold-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-courier-bold-r-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-bold-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Courier-BoldOblique",
+    { "Courier-BoldOblique", "GothicBBB-Medium" },
+    { "-adobe-courier-bold-o-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-courier-bold-o-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-bold-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Helvetica",
+    { "Helvetica", "Ryumin-Light" },
+    { "-adobe-helvetica-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-helvetica-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Helvetica-Oblique",
+    { "Helvetica-Oblique", "Ryumin-Light" },
+    { "-adobe-helvetica-medium-o-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-helvetica-medium-o-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Helvetica-Bold",
+    { "Helvetica-Bold", "GothicBBB-Medium" },
+    { "-adobe-helvetica-bold-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-helvetica-bold-r-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-bold-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Helvetica-BoldOblique",
+    { "Helvetica-BoldOblique", "GothicBBB-Medium" },
+    { "-adobe-helvetica-bold-o-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-helvetica-bold-o-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-bold-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Helvetica-Narrow",
+    { "Helvetica-Narrow", "Ryumin-Light" },
+    { "-adobe-helvetica-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-helvetica-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Helvetica-Narrow-Oblique",
+    { "Helvetica-Narrow-Oblique", "Ryumin-Light" },
+    { "-adobe-helvetica-medium-o-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-helvetica-medium-o-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Helvetica-Narrow-Bold",
+    { "Helvetica-Narrow-Bold", "GothicBBB-Medium" },
+    { "-adobe-helvetica-bold-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-helvetica-bold-r-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-bold-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Helvetica-Narrow-BoldOblique",
+    { "Helvetica-Narrow-BoldOblique", "GothicBBB-Medium" },
+    { "-adobe-helvetica-bold-o-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-helvetica-bold-o-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-bold-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "NewCenturySchoolbook-Roman",
+    { "NewCenturySchlbk-Roman", NULL },
+    { "-adobe-new century schoolbook-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+  { "NewCenturySchoolbook-Italic",
+    { "NewCenturySchlbk-Italic", NULL },
+    { "-adobe-new century schoolbook-medium-i-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+  { "NewCenturySchoolbook-Bold",
+    { "NewCenturySchlbk-Bold", NULL },
+    { "-adobe-new century schoolbook-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+  { "NewCenturySchoolbook-BoldItalic",
+    { "NewCenturySchlbk-BoldItalic", NULL },
+    { "-adobe-new century schoolbook-bold-i-normal-*-%d-*-*-*-*-*-*-*",
+      NULL
+    }
+  },
+  { "Palatino-Roman",
+    { "Palatino-Roman", NULL },
+    { "-adobe-palatino-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-*-lucidabright-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Palatino-Italic",
+    { "Palatino-Italic", NULL },
+    { "-adobe-palatino-medium-i-normal-*-%d-*-*-*-*-*-*-*",
+      "-*-lucidabright-medium-i-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Palatino-Bold",
+    { "Palatino-Bold", NULL },
+    { "-adobe-palatino-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-*-lucidabright-demibold-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Palatino-BoldItalic",
+    { "Palatino-BoldItalic", NULL },
+    { "-adobe-palatino-bold-i-normal-*-%d-*-*-*-*-*-*-*",
+      "-*-lucidabright-demibold-i-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "Symbol",
+    { "Symbol", NULL },
+    {
+      "-adobe-symbol-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-*-symbol-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "ZapfChancery-MediumItalic",
+    { "ZapfChancery-MediumItalic", NULL },
+    { "-adobe-zapf chancery-medium-i-normal-*-%d-*-*-*-*-*-*-*",
+      "-*-itc zapf chancery-medium-i-normal-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+  { "ZapfDingbats",
+    { "ZapfDingbats", NULL },
+    { "-adobe-zapf dingbats-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-*-itc zapf dingbats-*-*-*-*-%d-*-*-*-*-*-*-*"
+    }
+  },
+#else
   { "Times-Roman",
     "Times-Roman",
     { "-adobe-times-medium-r-normal-*-%d-*-*-*-*-*-*-*",
@@ -303,6 +526,7 @@
       "-*-itc zapf dingbats-*-*-*-*-%d-*-*-*-*-*-*-*"
     }
   },
+#endif
 };
 
 #define NUM_FONTS (sizeof(font_data)/sizeof(FontData))
@@ -336,7 +560,11 @@
       break;
     bufsize = strlen(x11_font)+6;  /* Should be enought*/
     buffer = (char *)g_malloc(bufsize);
+#ifdef JAPANESE
+    g_snprintf(buffer, bufsize, x11_font, 100, 100);
+#else
     g_snprintf(buffer, bufsize, x11_font, 100);
+#endif
     
     gdk_font = gdk_fontset_load(buffer);
     if (gdk_font!=NULL) {
@@ -353,7 +581,11 @@
       x11_font = last_resort_fonts[i];
       bufsize = strlen(x11_font)+6;  /* Should be enought*/
       buffer = (char *)g_malloc(bufsize);
+#ifdef JAPANESE
+      g_snprintf(buffer, bufsize, x11_font, 100, 100);
+#else
       g_snprintf(buffer, bufsize, x11_font, 100);
+#endif
       
       gdk_font = gdk_fontset_load(buffer);
       g_free(buffer);
@@ -379,12 +611,18 @@
   FontPrivate *font;
 
   fonts_hash = g_hash_table_new((GHashFunc)g_str_hash,
-			       (GCompareFunc)g_str_equal);
+				(GCompareFunc)g_str_equal);
 
   for (i=0;i<NUM_FONTS;i++) {
     font = g_new(FontPrivate, 1);
     font->public.name = font_data[i].fontname;
+#ifdef JAPANESE
+    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;
@@ -457,7 +695,7 @@
   
   bufsize = strlen(font->fontname_x11)+6;  /* Should be enought*/
   buffer = (char *)malloc(bufsize);
-  g_snprintf(buffer, bufsize, font->fontname_x11, height);
+  g_snprintf(buffer, bufsize, font->fontname_x11, height, height);
   gdk_font = gdk_fontset_load(buffer);
   free(buffer);
 
@@ -508,7 +746,11 @@
   return cache_item->suck_font;
 }
 
+#ifdef JAPANESE
+char **
+#else
 char *
+#endif
 font_get_psfontname(Font *font)
 {
   FontPrivate *fontprivate;
@@ -651,7 +893,7 @@
 static void
 suck_font_free (SuckFont *suckfont)
 {
-	g_free (suckfont->bitmap);
-	g_free (suckfont);
+  g_free (suckfont->bitmap);
+  g_free (suckfont);
 }
 
diff -uNr dia-0.84-1/lib/font.h dia-0.84-5/lib/font.h
--- dia-0.84-1/lib/font.h	Wed Feb  9 11:20:32 2000
+++ dia-0.84-5/lib/font.h	Mon Mar 27 12:48:34 2000
@@ -20,6 +20,7 @@
 
 #include <gdk/gdk.h>
 #include "geometry.h"
+#include "config.h"
 
 typedef enum {
   ALIGN_LEFT,
@@ -59,7 +60,11 @@
 extern Font *font_getfont(const char *name);
 extern GdkFont *font_get_gdkfont(Font *font, int height);
 extern SuckFont *font_get_suckfont(Font *font, int height);
+#ifdef JAPANESE
+extern char **font_get_psfontname(Font *font);
+#else
 extern char *font_get_psfontname(Font *font);
+#endif
 extern real font_string_width(const char *string, Font *font, real height);
 extern real font_ascent(Font *font, real height);
 extern real font_descent(Font *font, real height);
diff -uNr dia-0.84-1/lib/text.c dia-0.84-5/lib/text.c
--- dia-0.84-1/lib/text.c	Mon Mar 27 12:13:20 2000
+++ dia-0.84-5/lib/text.c	Mon Mar 27 12:48:34 2000
@@ -577,11 +577,29 @@
       text_join_lines(text, row);
     return;
   }
+#ifdef JAPANESE
+  if(text->line[row][text->cursor_pos+1] > 0) {
+    memmove(text->line[row] + text->cursor_pos,
+           text->line[row] + text->cursor_pos + 1,
+           text->strlen[row] - text->cursor_pos);
+
+    text->strlen[row]--;
+    text->cursor_pos --;
+  } else {
+    memmove(text->line[row] + text->cursor_pos,
+           text->line[row] + text->cursor_pos + 2,
+           text->strlen[row] - text->cursor_pos);
+  text->strlen[row]-=2;
+  text->cursor_pos -=2;
+  }
+#else
   memmove(text->line[row] + text->cursor_pos,
 	  text->line[row] + text->cursor_pos + 1,
 	  text->strlen[row] - text->cursor_pos);
 
   text->strlen[row]--;
+  text->cursor_pos--;
+#endif
   
   if (text->cursor_pos > text->strlen[text->cursor_row])
     text->cursor_pos = text->strlen[text->cursor_row];
@@ -608,6 +626,22 @@
       text_join_lines(text, row-1);
     return;
   }
+#ifdef JAPANESE
+  if(text->line[row][text->cursor_pos-1] > 0) {
+    memmove(text->line[row] + text->cursor_pos - 1,
+	    text->line[row] + text->cursor_pos,
+	    text->strlen[row] - text->cursor_pos + 1);
+    text->strlen[row]--;
+    
+    text->cursor_pos --;
+  } else {
+    memmove(text->line[row] + text->cursor_pos - 2,
+	    text->line[row] + text->cursor_pos,
+	    text->strlen[row] - text->cursor_pos + 1);
+    text->strlen[row]-=2;
+    text->cursor_pos -=2;
+  }
+#else
   memmove(text->line[row] + text->cursor_pos - 1,
 	  text->line[row] + text->cursor_pos,
 	  text->strlen[row] - text->cursor_pos + 1);
@@ -615,6 +649,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];
@@ -749,12 +784,28 @@
     
     break;
   case GDK_Left:
+#ifdef JAPANESE
+    if(text->line[text->cursor_row][text->cursor_pos-1] > 0) {
+      text->cursor_pos--;
+    } else {
+      text->cursor_pos-=2;
+    }
+#else
     text->cursor_pos--;
+#endif
     if (text->cursor_pos<0)
       text->cursor_pos = 0;
     break;
   case GDK_Right:
+#ifdef JAPANESE
+    if(text->line[text->cursor_row][text->cursor_pos+1] > 0) {
+      text->cursor_pos++;
+    } else {
+      text->cursor_pos+=2;
+    }
+#else
     text->cursor_pos++;
+#endif
     if (text->cursor_pos > text->strlen[text->cursor_row])
       text->cursor_pos = text->strlen[text->cursor_row];
     break;
diff -uNr dia-0.84-1/lib/text.h dia-0.84-5/lib/text.h
--- dia-0.84-1/lib/text.h	Sun Jul 25 16:30:14 1999
+++ dia-0.84-5/lib/text.h	Mon Mar 27 12:48:34 2000
@@ -21,6 +21,7 @@
 typedef struct _Text Text;
 typedef struct _TextAttributes TextAttributes;
 
+#include "config.h"
 #include "font.h"
 #include "focus.h"
 
diff -uNr dia-0.84-1/objects/UML/class.c dia-0.84-5/objects/UML/class.c
--- dia-0.84-1/objects/UML/class.c	Fri Nov 12 09:30:24 1999
+++ dia-0.84-5/objects/UML/class.c	Mon Mar 27 12:48:35 2000
@@ -428,18 +428,27 @@
   }
   if (umlclass->stereotype != NULL) {
     umlclass->namebox_height += font_height;
+#ifdef JAPANESE
+    umlclass->stereotype_string =
+      g_malloc(sizeof(char)*(strlen(umlclass->stereotype)+4+1));
+    
+    strcpy(umlclass->stereotype_string, UML_STEREOTYPE_START);
+#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 JAPANESE
+    strcat(umlclass->stereotype_string, UML_STEREOTYPE_END);
+#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);
   } else {
diff -uNr dia-0.84-1/objects/UML/uml.h dia-0.84-5/objects/UML/uml.h
--- dia-0.84-1/objects/UML/uml.h	Thu Jun  3 19:12:04 1999
+++ dia-0.84-5/objects/UML/uml.h	Mon Mar 27 12:48:35 2000
@@ -20,6 +20,7 @@
 
 #include <glib.h>
 #include "connectionpoint.h"
+#include "config.h"
 
 typedef struct _UMLAttribute UMLAttribute;
 typedef struct _UMLOperation UMLOperation;
@@ -77,8 +78,13 @@
 };
 
 /* Characters used to start/end stereotypes: */
+#ifdef JAPANESE
+#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);
diff -uNr dia-0.84-1/po/dia.pot dia-0.84-5/po/dia.pot
--- dia-0.84-1/po/dia.pot	Tue Feb 29 10:57:04 2000
+++ dia-0.84-5/po/dia.pot	Mon Mar 27 12:48:35 2000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-02-29 09:57+0800\n"
+"POT-Creation-Date: 2000-03-21 12:38+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -235,13 +235,13 @@
 msgid "/Objects/Align Vertical/Adjacent"
 msgstr ""
 
-#: app/disp_callbacks.c:69 app/properties.c:164
+#: app/disp_callbacks.c:126 app/properties.c:164
 msgid ""
 "This object doesn't support Undo/Redo.\n"
 "Undo information erased."
 msgstr ""
 
-#: app/disp_callbacks.c:163
+#: app/disp_callbacks.c:220
 msgid "No object menu"
 msgstr ""
 
@@ -253,38 +253,38 @@
 msgid "Diagram modified!"
 msgstr ""
 
-#: app/display.c:779 app/display.c:785
+#: app/display.c:784 app/display.c:790
 msgid "Really close?"
 msgstr ""
 
-#: app/display.c:790
+#: app/display.c:795
 msgid ""
 "This diagram has not been saved.\n"
 "Are you sure you want to close this window?"
 msgstr ""
 
-#: app/display.c:808 app/preferences.c:482 lib/properties.c:256
+#: app/display.c:813 app/preferences.c:482 lib/properties.c:256
 msgid "Yes"
 msgstr ""
 
-#: app/display.c:818 app/preferences.c:482 app/preferences.c:493
+#: app/display.c:823 app/preferences.c:482 app/preferences.c:493
 #: lib/properties.c:258 lib/properties.c:279
 msgid "No"
 msgstr ""
 
-#: app/display.c:851
+#: app/display.c:856
 msgid "/View/Show Rulers"
 msgstr ""
 
-#: app/display.c:853
+#: app/display.c:858
 msgid "/View/Visible Grid"
 msgstr ""
 
-#: app/display.c:855
+#: app/display.c:860
 msgid "/View/Snap To Grid"
 msgstr ""
 
-#: app/display.c:857
+#: app/display.c:862
 msgid "/View/Show Connection Points"
 msgstr ""
 
@@ -448,7 +448,7 @@
 "Not a Dia file."
 msgstr ""
 
-#: app/load_save.c:506 app/render_eps.c:161 app/render_svg.c:144
+#: app/load_save.c:506 app/render_eps.c:168 app/render_svg.c:144
 #: plug-ins/cgm/cgm.c:1127
 #, c-format
 msgid "Couldn't open: '%s' for writing.\n"
@@ -862,7 +862,7 @@
 msgid "This object has no properties."
 msgstr ""
 
-#: app/render_eps.c:1101
+#: app/render_eps.c:1186
 msgid "Encapsulated Postscript"
 msgstr ""
 
@@ -974,14 +974,14 @@
 msgid "Background"
 msgstr ""
 
-#: lib/font.c:355
+#: lib/font.c:593
 #, c-format
 msgid ""
 "Warning no X Font for %s found, \n"
 "using %s instead.\n"
 msgstr ""
 
-#: lib/font.c:409
+#: lib/font.c:653
 #, c-format
 msgid "Font %s not found, using Courier instead.\n"
 msgstr ""
@@ -1144,7 +1144,7 @@
 msgstr ""
 
 #. Class page:
-#: objects/UML/class.c:608 objects/UML/class_dialog.c:171
+#: objects/UML/class.c:617 objects/UML/class_dialog.c:171
 msgid "Class"
 msgstr ""
 
diff -uNr dia-0.84-1/po/ja.po dia-0.84-5/po/ja.po
--- dia-0.84-1/po/ja.po	Tue Feb 29 11:08:53 2000
+++ dia-0.84-5/po/ja.po	Mon Mar 27 12:48:35 2000
@@ -7,7 +7,7 @@
 "Project-Id-Version: dia cvs\n"
 "POT-Creation-Date: 2000-02-29 09:57+0800\n"
 "PO-Revision-Date: 2000-02-12 14:03+0900\n"
-"Last-Translator: Yukihiro Nakai <nakai@FreeBSD.org>\n"
+"Last-Translator: Yasuhiro ABE <m5031201@u-aizu.ac.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-jp\n"
@@ -378,8 +378,8 @@
 "Foreground & background colors.  The small black and white squares reset "
 "colors.  The small arrows swap colors.  Double click to change colors."
 msgstr ""
-"Ê¸»ú¤ÈÇØ·Ê¤Î¿§¤Ç¤¹¡£¹õ¤ÈÇò¤Î¾®¤µ¤Ê»Í³Ñ¤Ï¡¢¿§¤ò¥ê¥»¥Ã¥È¤·¤Þ¤¹¡£¾®¤µ¤ÊÌð°õ¤Ï¿§ò"
-"¸ò´¹¤·¤Þ¤¹¡£¥À¥Ö¥ë¥¯¥ê¥Ã¥¯¤¹¤ë¤È¿§¤òÊÑ¹¹¤·¤Þ¤¹¡"
+"Ê¸»ú¤ÈÇØ·Ê¤Î¿§¤Ç¤¹¡£¹õ¤ÈÇò¤Î¾®¤µ¤Ê»Í³Ñ¤Ï¡¢¿§¤ò¥ê¥»¥Ã¥È¤·¤Þ¤¹¡£¾®¤µ¤ÊÌð°õ¤Ï¿§"
+"¸ò´¹¤·¤Þ¤¹¡£¥À¥Ö¥ë¥¯¥ê¥Ã¥¯¤¹¤ë¤È¿§¤òÊÑ¹¹¤·¤Þ¤¹"
 
 #: app/interface.c:711
 msgid "Diagram Editor"
@@ -552,7 +552,7 @@
 
 #: app/menus.c:106
 msgid "_AntiAliased"
-msgstr ""
+msgstr "¥¢¥ó¥Á¥¢¥¤¥ê¥¢¥¹"
 
 #: app/menus.c:109
 msgid "_Visible Grid"
@@ -811,7 +811,7 @@
 
 #: app/menus.c:232
 msgid "/View/_AntiAliased"
-msgstr ""
+msgstr "/É½¼¨(_V)/¥¢¥ó¥Á¥¢¥¤¥ê¥¢¥¹"
 
 #: app/menus.c:234
 msgid "/View/_Visible Grid"
