--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,7 @@
 ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 ### 02111-1307, USA. 
 
-AC_REVISION($Revision: 1.239 $)
+AC_REVISION($Revision: 1.240 $)
 AC_PREREQ(2.9)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -140,8 +140,16 @@
 
 ### Allow the user disable support for GNU info.
 
+case "$canonical_host_type" in
+  *-*-cygwin32)
+    USE_GNU_INFO=false
+  *)
+    USE_GNU_INFO=true
+  ;;
+esac
+
 INFO_DIR=info
-USE_GNU_INFO=true
+
 AC_ARG_ENABLE(info,
   [  --enable-info           use GNU info (default is yes)],
   [if test $enableval = no; then
@@ -1004,6 +1012,14 @@
 
 AC_PROG_INSTALL
 
+EXE=
+case "$canonical_host_type" in
+  *-*-cygwin32)
+    EXE=.exe
+  ;;
+esac
+AC_SUBST(EXE);
+
 AC_CHECK_PROG(GNUPLOT_BINARY, gnuplot, gnuplot, [])
 if test -n "$GNUPLOT_BINARY"; then
   AC_MSG_CHECKING([to see if your gnuplot supports multiplot])