--- a/ChangeLog	Wed May 01 06:48:36 2002 +0000
+++ b/ChangeLog	Wed May 01 07:08:45 2002 +0000
@@ -1,3 +1,9 @@
+2002-05-01  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* configure.in (AC_AIX): Move before AC_MINIX and AC_ISC_POSIX.
+	(AH_BOTTOM): Move contents of acconfig.h here.
+	* acconfig.h: Delete.
+
 2002-04-27  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* configure.in (AC_CONFIG_FILES): Add libcruft/daspk/Makefile to

--- a/acconfig.h	Wed May 01 06:48:36 2002 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/* acconfig.h
-
-   Descriptive text for the C preprocessor macros that are needed by
-   Octave.
-
-   Leave the following blank line there!!  Autoheader needs it.  */
-
-
-
-
-/* Leave that blank line there!!  Autoheader needs it.
-   If you're adding to this file, keep in mind:
-   The entries are in sort -df order: alphabetical, case insensitive,
-   ignoring punctuation (such as underscores).  */
-
-@BOTTOM@
-
-#if defined (__GNUC__)
-#define GCC_ATTR_NORETURN __attribute__ ((__noreturn__))
-#define GCC_ATTR_UNUSED __attribute__ ((__unused__))
-#else
-#define GCC_ATTR_NORETURN
-#define GCC_ATTR_UNUSED
-#endif
-
-#define CONST_CAST(T, E) (T) (E)
-
-#define DYNAMIC_CAST(T, E) (T) (E)
-
-#define REINTERPRET_CAST(T, E) (T) (E)
-
-#define STATIC_CAST(T, E) (T) (E)
-
-#define X_CAST(T, E) (T) (E)
-
-#define HEAVYWEIGHT_INDEXING 1
-
-#define WITH_KPATHSEARCH 1
-
-#if defined(HAVE_F2C) && !defined(F77_FUNC)
-#  define F77_FUNC(x,X) x ## _
-#  define F77_FUNC_(x,X) x ## __
-#endif
-
-#if !defined(HAVE_DEV_T)
-typedef dev_t short
-#endif
-
-#if !defined(HAVE_INO_T)
-typedef ino_t unsigned long
-#endif
-
-#if !defined(HAVE_NLINK_T)
-typedef nlink_t short
-#endif
-
-#if !defined(HAVE_SIGSET_T)
-typedef sigset_t int
-#endif

--- a/configure.in	Wed May 01 06:48:36 2002 +0000
+++ b/configure.in	Wed May 01 07:08:45 2002 +0000
@@ -22,7 +22,7 @@
 ### 02111-1307, USA. 
 
 AC_INIT
-AC_REVISION($Revision: 1.357 $)
+AC_REVISION($Revision: 1.358 $)
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -31,9 +31,9 @@
   
 OCTAVE_HOST_TYPE
 
-AC_ISC_POSIX
+AC_AIX
 AC_MINIX
-AC_AIX
+AC_ISC_POSIX
 
 ### some defaults
 
@@ -1181,6 +1181,53 @@
 	AC_CONFIG_SUBDIRS(plplot)
 fi
 
+### Some things to add to the bottom of config.h.
+
+AH_BOTTOM([
+#if defined (__GNUC__)
+#define GCC_ATTR_NORETURN __attribute__ ((__noreturn__))
+#define GCC_ATTR_UNUSED __attribute__ ((__unused__))
+#else
+#define GCC_ATTR_NORETURN
+#define GCC_ATTR_UNUSED
+#endif
+
+#define CONST_CAST(T, E) (T) (E)
+
+#define DYNAMIC_CAST(T, E) (T) (E)
+
+#define REINTERPRET_CAST(T, E) (T) (E)
+
+#define STATIC_CAST(T, E) (T) (E)
+
+#define X_CAST(T, E) (T) (E)
+
+#define HEAVYWEIGHT_INDEXING 1
+
+#define WITH_KPATHSEARCH 1
+
+#if defined(HAVE_F2C) && !defined(F77_FUNC)
+#  define F77_FUNC(x,X) x ## _
+#  define F77_FUNC_(x,X) x ## __
+#endif
+
+#if !defined(HAVE_DEV_T)
+typedef dev_t short
+#endif
+
+#if !defined(HAVE_INO_T)
+typedef ino_t unsigned long
+#endif
+
+#if !defined(HAVE_NLINK_T)
+typedef nlink_t short
+#endif
+
+#if !defined(HAVE_SIGSET_T)
+typedef sigset_t int
+#endif
+])
+
 ### Do the substitutions in all the Makefiles.
 
 AC_CONFIG_FILES([Makefile octMakefile Makeconf install-octave \

--- a/glob/ChangeLog	Wed May 01 06:48:36 2002 +0000
+++ b/glob/ChangeLog	Wed May 01 07:08:45 2002 +0000
@@ -1,3 +1,7 @@
+2002-05-01  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* configure.in: Add AC_CONFIG_HEADERS.
+
 2002-04-03  Steven G. Johnson <stevenj@alum.mit.edu>
 
 	* configure.in: Update for autoconf 2.5x.

--- a/glob/configure.in	Wed May 01 06:48:36 2002 +0000
+++ b/glob/configure.in	Wed May 01 07:08:45 2002 +0000
@@ -2,6 +2,7 @@
 AC_INIT
 AC_CONFIG_SRCDIR([fnmatch.c])		dnl A distinctive file to look for in srcdir.
 AC_PREREQ(2.52)			dnl Minimum Autoconf version required.
+AC_CONFIG_HEADER(config.h)
 AC_PROG_CC
 AC_CHECK_PROG(AR, ar, ar, ar)
 AC_PROG_RANLIB