Upgrade to Autoconf version 2.53. Replaced many custom macro

calls with new or now-built-in versions.  Make sure that all
calls to AC_DEFINE have a third argument, for possible use of
autoheader in the future.

src/Makefile.global.in

@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.143 2002/03/13 00:05:02 petere Exp $
+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.144 2002/03/29 17:32:54 petere Exp $
 
 #------------------------------------------------------------------------------
 # All PostgreSQL makefiles include this file and use the variables it sets,
@@ -29,20 +29,24 @@ all:
 .DELETE_ON_ERROR:
 
 # PostgreSQL version number
-VERSION = @VERSION@
+VERSION = @PACKAGE_VERSION@
 
 # Support for VPATH builds
+vpath_build = @vpath_build@
 abs_top_srcdir = @abs_top_srcdir@
 
-ifndef abs_top_srcdir
+ifneq ($(vpath_build),yes)
 top_srcdir = $(top_builddir)
 srcdir = .
-else
+else # vpath_build = yes
 top_srcdir = $(abs_top_srcdir)
 srcdir = $(top_srcdir)/$(subdir)
 VPATH = $(srcdir)
 endif
 
+# Saved arguments from configure
+configure_args = @configure_args@
+
 
 ##########################################################################
 #
@@ -357,7 +361,7 @@ TAS         = @TAS@
 # write `include $(top_builddir)/src/Makefile.global', not some
 # shortcut thereof.
 $(top_builddir)/src/Makefile.global: $(top_srcdir)/src/Makefile.global.in $(top_builddir)/config.status
-	cd $(top_builddir) && CONFIG_FILES=src/Makefile.global CONFIG_HEADERS= ./config.status
+	cd $(top_builddir) && ./config.status src/Makefile.global
 
 # Remake pg_config.h from pg_config.h.in if the latter changed.
 # config.status will not change the timestamp on pg_config.h if it
@@ -372,7 +376,7 @@ $(top_builddir)/src/Makefile.global: $(top_srcdir)/src/Makefile.global.in $(top_
 $(top_builddir)/src/include/pg_config.h: $(top_builddir)/src/include/stamp-h
 
 $(top_builddir)/src/include/stamp-h: $(top_srcdir)/src/include/pg_config.h.in $(top_builddir)/config.status
-	cd $(top_builddir) && CONFIG_FILES= CONFIG_HEADERS=src/include/pg_config.h ./config.status
+	cd $(top_builddir) && ./config.status src/include/pg_config.h
 
 # When configure changes, rerun configure with the same options as
 # last time. To change configure, you need to run autoconf manually.

src/bin/pg_config/Makefile

@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/src/bin/pg_config/Makefile,v 1.3 2001/09/16 16:11:11 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_config/Makefile,v 1.4 2002/03/29 17:32:55 petere Exp $
 
 subdir = src/bin/pg_config
 top_builddir = ../../..
@@ -6,14 +6,13 @@ include $(top_builddir)/src/Makefile.global
 
 all: pg_config
 
-pg_config: pg_config.sh $(top_builddir)/config.status $(top_builddir)/src/Makefile.global Makefile
-	configure=`sed -n '7s,^# [^ ]*configure *,,p' $(top_builddir)/config.status` && \
+pg_config: pg_config.sh $(top_builddir)/src/Makefile.global Makefile
 	sed -e 's,@bindir@,$(bindir),g' \
 	    -e 's,@includedir@,$(includedir),g' \
 	    -e 's,@includedir_server@,$(includedir_server),g' \
 	    -e 's,@libdir@,$(libdir),g' \
 	    -e 's,@pkglibdir@,$(pkglibdir),g' \
-	    -e "s,@configure@,$$configure,g" \
+	    -e "s,@configure@,$(configure_args),g" \
 	    -e 's,@version@,$(VERSION),g' \
 	  $< >$@
 	chmod a+x $@

src/include/c.h

@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: c.h,v 1.114 2002/01/22 19:02:39 tgl Exp $
+ * $Id: c.h,v 1.115 2002/03/29 17:32:55 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -57,7 +57,7 @@
 #include <string.h>
 #include <stddef.h>
 #include <stdarg.h>
-#ifdef STRING_H_WITH_STRINGS_H
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
 
@@ -626,14 +626,14 @@ typedef NameData *Name;
  * in pg_config.h we haven't yet included anything that defines size_t...
  */
 
-#ifndef HAVE_SNPRINTF_DECL
+#if !HAVE_DECL_SNPRINTF
 extern int
 snprintf(char *str, size_t count, const char *fmt,...)
 /* This extension allows gcc to check the format string */
 __attribute__((format(printf, 3, 4)));
 #endif
 
-#ifndef HAVE_VSNPRINTF_DECL
+#if !HAVE_DECL_VSNPRINTF
 extern int	vsnprintf(char *str, size_t count, const char *fmt, va_list args);
 #endif
 

src/include/pg_config.h.in

@@ -8,7 +8,7 @@
  * or in pg_config.h afterwards.  Of course, if you edit pg_config.h, then your
  * changes will be overwritten the next time you run configure.
  *
- * $Id: pg_config.h.in,v 1.18 2002/02/25 17:11:22 tgl Exp $
+ * $Id: pg_config.h.in,v 1.19 2002/03/29 17:32:55 petere Exp $
  */
 
 #ifndef PG_CONFIG_H
@@ -408,8 +408,8 @@
 /* Set to 1 if you have <sys/pstat.h> */
 #undef HAVE_SYS_PSTAT_H
 
-/* Define if string.h and strings.h may both be included */
-#undef STRING_H_WITH_STRINGS_H
+/* Define to 1 if you have strings.h */
+#undef HAVE_STRINGS_H
 
 /* Define if you have the setproctitle function.  */
 #undef HAVE_SETPROCTITLE
@@ -439,13 +439,13 @@
 #undef HAVE_SNPRINTF
 
 /* Set to 1 if your standard system headers declare snprintf() */
-#undef HAVE_SNPRINTF_DECL
+#undef HAVE_DECL_SNPRINTF
 
 /* Set to 1 if you have vsnprintf() in the C library */
 #undef HAVE_VSNPRINTF
 
 /* Set to 1 if your standard system headers declare vsnprintf() */
-#undef HAVE_VSNPRINTF_DECL
+#undef HAVE_DECL_VSNPRINTF
 
 /* Set to 1 if you have strerror() */
 #undef HAVE_STRERROR
@@ -581,9 +581,9 @@ extern void srandom(unsigned int seed);
 #undef HAVE_FDATASYNC
 
 /* Define if the standard header unistd.h declares fdatasync() */
-#undef HAVE_FDATASYNC_DECL
+#undef HAVE_DECL_FDATASYNC
 
-#if defined(HAVE_FDATASYNC) && !defined(HAVE_FDATASYNC_DECL)
+#if defined(HAVE_FDATASYNC) && !HAVE_DECL_FDATASYNC
 extern int fdatasync(int fildes);
 #endif
 

src/template/aix

@@ -6,4 +6,5 @@ else # not GCC
     aix3.2.5 | aix4.1*)
       CFLAGS='-qmaxmem=16384 -qsrcmsg' ;;
   esac
+  CCC=xlC
 fi # not GCC