--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-02  John W. Eaton  <jwe@octave.org>
+
+	* configure.ac: Don't check for atexit or on_exit.
+
 2010-02-02  John W. Eaton  <jwe@octave.org>
 
 	* configure.ac: Don't check for bcopy, bzero, or memmove.

--- a/configure.ac
+++ b/configure.ac
@@ -1495,12 +1495,12 @@
 
 ### Checks for functions and variables.
 
-AC_CHECK_FUNCS(atexit basename canonicalize_file_name \
+AC_CHECK_FUNCS(basename canonicalize_file_name \
   chmod dup2 endgrent endpwent execvp expm1 expm1f fcntl fork getcwd \
   getegid geteuid getgid getgrent getgrgid getgrnam getpgrp getpid \
   getppid getpwent getpwuid getuid getwd _kbhit kill \
   lgamma lgammaf lgamma_r lgammaf_r localtime_r log1p log1pf \
-  mkstemp on_exit pipe poll putenv raise \
+  mkstemp pipe poll putenv raise \
   realpath resolvepath rindex roundl select setgrent setlocale \
   setpwent setvbuf sigaction siglongjmp sigpending sigprocmask sigsuspend \
   snprintf strdup strerror strsignal tempnam tgammaf trunc umask \

--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-02  John W. Eaton  <jwe@octave.org>
+
+	* octave.cc (octave_main): Assume we have atexit.
+
 2010-02-01  Jaroslav Hajek  <highegg@gmail.com>
 
 	* load-path.cc (load_path::add_to_fcn_map): Warn when core library or

--- a/src/octave.cc
+++ b/src/octave.cc
@@ -77,11 +77,6 @@
 
 extern void install_builtins (void);
 
-#if !defined (HAVE_ATEXIT) && defined (HAVE_ON_EXIT)
-extern "C" int on_exit ();
-#define atexit on_exit
-#endif
-
 // The command-line options.
 static string_vector octave_argv;
 
@@ -764,13 +759,11 @@
 	}
     }
 
-#if defined (HAVE_ATEXIT) || defined (HAVE_ON_EXIT)
   // Make sure we clean up when we exit.  Also allow users to register
   // functions.  If we don't have atexit or on_exit, we're going to
   // leave some junk files around if we exit abnormally.
 
   atexit (do_octave_atexit);
-#endif
 
   // Is input coming from a terminal?  If so, we are probably
   // interactive.