diff --git a/ChangeLog b/ChangeLog
index 37e884f9e491f555a4be77108594a9acffd5d88b..b062a2dee32db7b9ae62d139cba2949c4c07df3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-02  Niels Möller  <niels@s3.kth.se>
+
+	* configure.ac: Added workaround to get the correct $(EXEEXT)=''
+	when compiling with rntcl.
+
 2004-03-02  Niels Möller  <nisse@lysator.liu.se>
 
 	* testsuite/Makefile.am (noinst_PROGRAMS): Put test program list
diff --git a/configure.ac b/configure.ac
index e3e56b9a64f43aefdb8c7d533e411a4f7e53fcb5..5c22814a3dd17b7821317c64e8f6a6b88f282514 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,6 +49,20 @@ LSH_RPATH_INIT([`echo $with_lib_path | sed 's/:/ /g'` \
 
 # Checks for programs.
 AC_PROG_CC
+
+# When $CC foo.c -o foo creates both foo and foo.exe, autoconf picks
+# up the foo.exe and sets exeext to .exe. That is correct for cygwin,
+# which has some kind of magic link from foo to foo.exe, but not for
+# rntcl. A better check for the cygwin case would check if the
+# contents of foo and foo.exe are equal; in the rntcl case, foo is a
+# sh script, and foo.exe is a windows executable.
+
+if "x$CC" = xrntcl ; then
+    AC_MSG_NOTICE([Compiling with rntcl; clearing exeext])
+    ac_exeext=''
+    ac_cv_exeext=''
+fi
+
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 AM_PROG_CC_STDC