--- gforth/configure.in	1998/08/02 10:00:01	1.38
+++ gforth/configure.in	1998/12/12 22:32:04	1.42
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-#Copyright (C) 1995,1996 Free Software Foundation, Inc.
+#Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -85,6 +85,7 @@ case "$ac_cv_sizeof_char_p" in
     ;;
 esac
 
+AC_CHECK_SIZEOF(char)
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
@@ -92,11 +93,14 @@ AC_CHECK_SIZEOF(long long)
 
 ac_cv_int_type_cell=none
 case "$ac_cv_sizeof_char_p" in
+  $ac_cv_sizeof_int)
+    ac_cv_int_type_cell=int
+    ;;
   $ac_cv_sizeof_short)
     ac_cv_int_type_cell=short
     ;;
-  $ac_cv_sizeof_int)
-    ac_cv_int_type_cell=int
+  $ac_cv_sizeof_char)
+    ac_cv_int_type_cell=char
     ;;
   $ac_cv_sizeof_long)
     ac_cv_int_type_cell=long
@@ -221,6 +225,16 @@ esac
 AC_SUBST(host)
 AC_SUBST(ENGINE_FLAGS)
 
+case "$host_os" in
+	*win32)
+		EXE=".exe"
+		;;
+	*)
+		EXE=""
+		;;
+esac
+AC_SUBST(EXE)
+
 dnl Now a little support for DOS/DJGCC
 AC_SUBST(GFORTH_EXE)
 GFORTH_EXE=""
@@ -266,7 +280,6 @@ dnl using sin here is no good idea since
 AC_CHECK_LIB(m,asin)
 AC_CHECK_FUNCS(dlopen)
 AC_CHECK_LIB(dl,dlopen)
-AC_CHECK_LIB(kernel32,GetModuleHandle)
 if test "$host_os" != "nextstep3"
 then
 	AC_FUNC_MEMCMP