From ec70bfe89e22d87285f0f5e2cc2777ee17e2db17 Mon Sep 17 00:00:00 2001
From: mdejong <mdejong>
Date: Sat, 23 Jun 2001 02:15:18 +0000
Subject: 	* win/configure: Regen. 	* win/tcl.m4
 (SC_CONFIG_CFLAGS): Link to the 	imm32 library when building with mingw
 gcc. 	* win/tkWinX.c: Include the imm.h header 	to fix compiling with
 mingw gcc.

---
 ChangeLog     | 8 ++++++++
 win/configure | 2 +-
 win/tcl.m4    | 2 +-
 win/tkWinX.c  | 8 +++++++-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 330a4b5..bcb7524 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 2001-06-22  Mo DeJong  <mdejong@redhat.com>
 
 	* win/configure: Regen.
+	* win/tcl.m4 (SC_CONFIG_CFLAGS): Link to the
+	imm32 library when building with mingw gcc.
+	* win/tkWinX.c: Include the imm.h header
+	to fix compiling with mingw gcc.
+
+2001-06-22  Mo DeJong  <mdejong@redhat.com>
+
+	* win/configure: Regen.
 	* win/configure.in: Add resource compiler fix from
 	8.3.3 to fix compiling with mingw.
 
diff --git a/win/configure b/win/configure
index 1ac97d1..4867e9f 100755
--- a/win/configure
+++ b/win/configure
@@ -1144,7 +1144,7 @@ echo "configure:1131: checking compiler flags" >&5
 	SHLIB_LD=""
 	SHLIB_LD_LIBS=""
 	LIBS=""
-	LIBS_GUI="-lgdi32 -lcomdlg32"
+	LIBS_GUI="-lgdi32 -lcomdlg32 -limm32"
 	STLIB_LD="${AR}"
 	RC_OUT=-o
 	RC_TYPE=
diff --git a/win/tcl.m4 b/win/tcl.m4
index 51ec7c7..2d7fb6d 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -344,7 +344,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
 	SHLIB_LD=""
 	SHLIB_LD_LIBS=""
 	LIBS=""
-	LIBS_GUI="-lgdi32 -lcomdlg32"
+	LIBS_GUI="-lgdi32 -lcomdlg32 -limm32"
 	STLIB_LD="${AR}"
 	RC_OUT=-o
 	RC_TYPE=
diff --git a/win/tkWinX.c b/win/tkWinX.c
index eab5ba4..a2505f7 100644
--- a/win/tkWinX.c
+++ b/win/tkWinX.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinX.c,v 1.13 2001/05/30 22:41:29 hobbs Exp $
+ * RCS: @(#) $Id: tkWinX.c,v 1.14 2001/06/23 02:15:18 mdejong Exp $
  */
 
 #include "tkWinInt.h"
@@ -22,6 +22,12 @@
 #include <zmouse.h>
 
 /*
+ * imm.h is needed by HandleIMEComposition
+ */
+
+#include <imm.h>
+
+/*
  * Declarations of static variables used in this file.
  */
 
-- 
cgit v0.12