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.
postgres · Mar 29, 2002 · ae7cdc8 · ae7cdc8
1 parent b1a3174
commit ae7cdc8
Show file tree

Hide file tree

Showing 20 changed files with 14,342 additions and 6,662 deletions.
diff --git a/GNUmakefile.in b/GNUmakefile.in
@@ -31,6 +31,8 @@ clean:
 	$(MAKE) -C doc $@
 	$(MAKE) -C contrib $@
 	$(MAKE) -C src $@
+# Garbage from autoconf:
+	@rm -rf autom4te.cache/
 
 # Important: distclean `src' last, otherwise Makefile.global
 # will be gone too soon.
@@ -39,14 +41,16 @@ distclean maintainer-clean:
 	-$(MAKE) -C contrib $@
 	-$(MAKE) -C src $@
 	-rm -f config.cache config.log config.status GNUmakefile
+# Garbage from autoconf:
+	@rm -rf autom4te.cache/
 
 check: all
 
 check installcheck:
 	$(MAKE) -C src/test $@
 
 GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
-	CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
+	./config.status $@
 
 
 ##########################################################################

diff --git a/aclocal.m4 b/aclocal.m4
@@ -1,13 +1,13 @@
 dnl $Header$
-builtin([include], [config/ac_func_accept_argtypes.m4])
-builtin([include], [config/c-compiler.m4])
-builtin([include], [config/c-library.m4])
-builtin([include], [config/cxx.m4])
-builtin([include], [config/docbook.m4])
-builtin([include], [config/general.m4])
-builtin([include], [config/java.m4])
-builtin([include], [config/libtool.m4])
-builtin([include], [config/perl.m4])
-builtin([include], [config/programs.m4])
-builtin([include], [config/python.m4])
-builtin([include], [config/tcl.m4])
+m4_include([config/ac_func_accept_argtypes.m4])
+m4_include([config/c-compiler.m4])
+m4_include([config/c-library.m4])
+m4_include([config/cxx.m4])
+m4_include([config/docbook.m4])
+m4_include([config/general.m4])
+m4_include([config/java.m4])
+m4_include([config/libtool.m4])
+m4_include([config/perl.m4])
+m4_include([config/programs.m4])
+m4_include([config/python.m4])
+m4_include([config/tcl.m4])
diff --git a/config/ac_func_accept_argtypes.m4 b/config/ac_func_accept_argtypes.m4
@@ -37,7 +37,7 @@ dnl
 # which is *not* 'socklen_t *').  If we detect that, then we assume
 # 'int' as the result, because that ought to work best.
 
-AC_DEFUN(AC_FUNC_ACCEPT_ARGTYPES,
+AC_DEFUN([AC_FUNC_ACCEPT_ARGTYPES],
 [AC_MSG_CHECKING([types of arguments for accept()])
  AC_CACHE_VAL(ac_cv_func_accept_arg1,dnl
  [AC_CACHE_VAL(ac_cv_func_accept_arg2,dnl
@@ -67,7 +67,10 @@ extern int accept ($ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func
   ])dnl AC_CACHE_VAL
  ])dnl AC_CACHE_VAL
  AC_MSG_RESULT([$ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3 *])
- AC_DEFINE_UNQUOTED(ACCEPT_TYPE_ARG1,$ac_cv_func_accept_arg1)
- AC_DEFINE_UNQUOTED(ACCEPT_TYPE_ARG2,$ac_cv_func_accept_arg2)
- AC_DEFINE_UNQUOTED(ACCEPT_TYPE_ARG3,$ac_cv_func_accept_arg3)
+ AC_DEFINE_UNQUOTED(ACCEPT_TYPE_ARG1, $ac_cv_func_accept_arg1,
+                    [Define to the type of arg 1 of 'accept'])
+ AC_DEFINE_UNQUOTED(ACCEPT_TYPE_ARG2, $ac_cv_func_accept_arg2,
+                    [Define to the type of arg 2 of 'accept'])
+ AC_DEFINE_UNQUOTED(ACCEPT_TYPE_ARG3, $ac_cv_func_accept_arg3,
+                    [Define to the type of arg 3 of 'accept'])
 ])
diff --git a/config/c-compiler.m4 b/config/c-compiler.m4
@@ -17,22 +17,6 @@ fi])# PGAC_C_SIGNED
 
 
 
-# PGAC_C_VOLATILE
-# ---------------
-# Check if the C compiler understands `volatile'. Note that if it doesn't
-# then this will potentially break the program semantics.
-AC_DEFUN([PGAC_C_VOLATILE],
-[AC_CACHE_CHECK(for volatile, pgac_cv_c_volatile,
-[AC_TRY_COMPILE([],
-[extern volatile int i;],
-[pgac_cv_c_volatile=yes],
-[pgac_cv_c_volatile=no])])
-if test x"$pgac_cv_c_volatile" = xno ; then
-  AC_DEFINE(volatile,, [Define empty if the C compiler does not understand `volatile'])
-fi])# PGAC_C_VOLATILE
-
-
-
 # PGAC_TYPE_64BIT_INT(TYPE)
 # -------------------------
 # Check if TYPE is a working 64 bit integer type. Set HAVE_TYPE_64 to
@@ -84,67 +68,27 @@ undefine([Ac_cachevar])dnl
 
 
 
-# PGAC_CHECK_ALIGNOF(TYPE)
-# ------------------------
+# PGAC_CHECK_ALIGNOF(TYPE, [INCLUDES = DEFAULT-INCLUDES])
+# -----------------------------------------------------
 # Find the alignment requirement of the given type. Define the result
-# as ALIGNOF_TYPE. If cross-compiling, sizeof(type) is used as a
-# default assumption.
-#
-# This is modeled on the standard autoconf macro AC_CHECK_SIZEOF.
-# That macro never got any points for style.
+# as ALIGNOF_TYPE.  This macro works even when cross compiling.
+# (Modelled after AC_CHECK_SIZEOF.)
+
 AC_DEFUN([PGAC_CHECK_ALIGNOF],
-[changequote(<<, >>)dnl
-dnl The name to #define.
-define(<<AC_TYPE_NAME>>, translit(alignof_$1, [a-z *], [A-Z_P]))dnl
-dnl The cache variable name.
-define(<<AC_CV_NAME>>, translit(pgac_cv_alignof_$1, [ *], [_p]))dnl
-changequote([, ])dnl
-AC_MSG_CHECKING(alignment of $1)
-AC_CACHE_VAL(AC_CV_NAME,
-[AC_TRY_RUN([#include <stdio.h>
-struct { char filler; $1 field; } mystruct;
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", ((char*) & mystruct.field) - ((char*) & mystruct));
-  exit(0);
-}], AC_CV_NAME=`cat conftestval`,
-AC_CV_NAME='sizeof($1)',
-AC_CV_NAME='sizeof($1)')])dnl
-AC_MSG_RESULT($AC_CV_NAME)
-AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The alignment requirement of a `]$1['])
-undefine([AC_TYPE_NAME])dnl
-undefine([AC_CV_NAME])dnl
+[AS_LITERAL_IF([$1], [],
+               [AC_FATAL([$0: requires literal arguments])])dnl
+AC_CHECK_TYPE([$1], [], [], [$2])
+AC_CACHE_CHECK([alignment of $1], [AS_TR_SH([pgac_cv_alignof_$1])],
+[if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then
+  _AC_COMPUTE_INT([((char*) & pgac_struct.field) - ((char*) & pgac_struct)],
+                  [AS_TR_SH([pgac_cv_alignof_$1])],
+                  [AC_INCLUDES_DEFAULT([$2])
+struct { char filler; $1 field; } pgac_struct;],
+                  [AC_MSG_ERROR([cannot compute alignment of $1, 77])])
+else
+  AS_TR_SH([pgac_cv_alignof_$1])=0
+fi])dnl
+AC_DEFINE_UNQUOTED(AS_TR_CPP(alignof_$1),
+                   [$AS_TR_SH([pgac_cv_alignof_$1])],
+                   [The alignment requirement of a `$1'])
 ])# PGAC_CHECK_ALIGNOF
-
-
-# PGAC_CHECK_TYPE(TYPE, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], [INCLUDES])
-# ---------------------------------------------------------------------------
-
-AC_DEFUN([PGAC_CHECK_TYPE],
-[changequote(<<,>>)dnl
-dnl The name to #define
-define(<<AC_TYPE_NAME>>, translit(have_$1, [a-z *], [A-Z_P]))dnl
-dnl The cache variable name.
-define(<<AC_CV_NAME>>, translit(pgac_cv_have_$1, [ *], [_p]))dnl
-changequote([, ])dnl
-AC_CACHE_CHECK([for $1], AC_CV_NAME,
-[AC_TRY_COMPILE([$4],
-[if (($1 *) 0)
-  return 0;
-if (sizeof ($1))
-  return 0;],
-AC_CV_NAME[=yes],
-AC_CV_NAME[=no])])
-if test "$AC_CV_NAME" = yes; then
-  AC_DEFINE(AC_TYPE_NAME, 1, [Define to 1 if you have `]$1['])
-  ifelse($2,,,[$2
-])[]dnl
-ifelse($3,,,[else
-  $3
-])[]dnl
-fi
-undefine([AC_TYPE_NAME])dnl
-undefine([AC_CV_NAME])dnl
-])# PGAC_CHECK_TYPE
diff --git a/config/c-library.m4 b/config/c-library.m4
@@ -37,11 +37,11 @@ fi])# PGAC_FUNC_GETTIMEOFDAY_1ARG
 
 
 # PGAC_FUNC_MEMCMP
-# -----------
+# ----------------
 # Check if memcmp() properly handles negative bytes and returns +/-.
 # SunOS does not.
 # AC_FUNC_MEMCMP
-AC_DEFUN(PGAC_FUNC_MEMCMP,
+AC_DEFUN([PGAC_FUNC_MEMCMP],
 [AC_CACHE_CHECK(for 8-bit clean memcmp, pgac_cv_func_memcmp_clean,
 [AC_TRY_RUN([
 main()
@@ -66,16 +66,10 @@ AC_SUBST(MEMCMP)dnl
 # If it doesn't then one could define it as
 # union semun { int val; struct semid_ds *buf; unsigned short *array; }
 AC_DEFUN([PGAC_UNION_SEMUN],
-[AC_CACHE_CHECK(for union semun, pgac_cv_union_semun,
-[AC_TRY_COMPILE([#include <sys/types.h>
+[AC_CHECK_TYPE([union semun], [], [],
+[#include <sys/types.h>
 #include <sys/ipc.h>
-#include <sys/sem.h>],
-  [union semun semun;],
-  [pgac_cv_union_semun=yes],
-  [pgac_cv_union_semun=no])])
-if test x"$pgac_cv_union_semun" = xyes ; then
-  AC_DEFINE(HAVE_UNION_SEMUN, 1, [Set to 1 if you have `union semun'])
-fi])# PGAC_UNION_SEMUN
+#include <sys/sem.h>])])# PGAC_UNION_SEMUN
 
 
 # PGAC_STRUCT_SOCKADDR_UN
@@ -84,17 +78,12 @@ fi])# PGAC_UNION_SEMUN
 # it is missing then one could define it as { short int sun_family;
 # char sun_path[108]; }. (Requires test for <sys/un.h>!)
 AC_DEFUN([PGAC_STRUCT_SOCKADDR_UN],
-[AC_CACHE_CHECK([for struct sockaddr_un], pgac_cv_struct_sockaddr_un,
-[AC_TRY_COMPILE([#include <sys/types.h>
+[AC_CHECK_TYPES([struct sockaddr_un], [], [],
+[#include <sys/types.h>
 #ifdef HAVE_SYS_UN_H
 #include <sys/un.h>
-#endif],
-                [struct sockaddr_un un;],
-                [pgac_cv_struct_sockaddr_un=yes],
-                [pgac_cv_struct_sockaddr_un=no])])
-if test x"$pgac_cv_struct_sockaddr_un" = xyes; then
-  AC_DEFINE(HAVE_STRUCT_SOCKADDR_UN, 1, [Set to 1 if you have `struct sockaddr_un'])
-fi])# PGAC_STRUCT_SOCKADDR_UN
+#endif
+])])# PGAC_STRUCT_SOCKADDR_UN
 
 
 # PGAC_FUNC_POSIX_SIGNALS
@@ -121,109 +110,3 @@ if test x"$pgac_cv_func_posix_signals" = xyes ; then
 fi
 HAVE_POSIX_SIGNALS=$pgac_cv_func_posix_signals
 AC_SUBST(HAVE_POSIX_SIGNALS)])# PGAC_FUNC_POSIX_SIGNALS
-
-
-# PGAC_STRUCT_CMSGCRED
-# --------------------
-# Check if `struct cmsgcred' exists. Define HAVE_STRUCT_CMSGCRED if so.
-AC_DEFUN([PGAC_STRUCT_CMSGCRED],
-[AC_CACHE_CHECK(for struct cmsgcred, pgac_cv_struct_cmsgcred,
-[AC_TRY_COMPILE([#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/ucred.h>],
-  [struct cmsgcred sockcred;],
-  [pgac_cv_struct_cmsgcred=yes],
-  [pgac_cv_struct_cmsgcred=no])])
-if test x"$pgac_cv_struct_cmsgcred" = xyes ; then
-  AC_DEFINE(HAVE_STRUCT_CMSGCRED, 1, [Set to 1 if you have `struct cmsgcred'])
-fi])# PGAC_STRUCT_CMSGCRED
-
-
-# PGAC_STRUCT_FCRED
-# -----------------
-# Check if `struct fcred' exists. Define HAVE_STRUCT_FCRED if so.
-AC_DEFUN([PGAC_STRUCT_FCRED],
-[AC_CACHE_CHECK(for struct fcred, pgac_cv_struct_fcred,
-[AC_TRY_COMPILE([#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/ucred.h>],
-  [struct fcred sockcred;],
-  [pgac_cv_struct_fcred=yes],
-  [pgac_cv_struct_fcred=no])])
-if test x"$pgac_cv_struct_fcred" = xyes ; then
-  AC_DEFINE(HAVE_STRUCT_FCRED, 1, [Set to 1 if you have `struct fcred'])
-fi])# PGAC_STRUCT_FCRED
-
-
-# PGAC_STRUCT_SOCKCRED
-# --------------------
-# Check if `struct sockcred' exists. Define HAVE_STRUCT_SOCKCRED if so.
-AC_DEFUN([PGAC_STRUCT_SOCKCRED],
-[AC_CACHE_CHECK(for struct sockcred, pgac_cv_struct_sockcred,
-[AC_TRY_COMPILE([#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/ucred.h>],
-  [struct sockcred sockcred;],
-  [pgac_cv_struct_sockcred=yes],
-  [pgac_cv_struct_sockcred=no])])
-if test x"$pgac_cv_struct_sockcred" = xyes ; then
-  AC_DEFINE(HAVE_STRUCT_SOCKCRED, 1, [Set to 1 if you have `struct sockcred'])
-fi])# PGAC_STRUCT_SOCKCRED
-
-
-# PGAC_HEADER_STRING
-# ------------------
-# Tests whether <string.h> and <strings.h> can both be included
-# (without generating warnings).  This is mostly useful if you need
-# str[n]casecmp(), since this is not in the "standard" <string.h>
-# on some systems.
-AC_DEFUN([PGAC_HEADER_STRING],
-[AC_CACHE_CHECK([whether string.h and strings.h may both be included],
-                [pgac_cv_header_strings_both],
-[AC_TRY_CPP(
-[#include <string.h>
-#include <strings.h>
-],
-[AC_TRY_COMPILE(
-[#include <string.h>
-#include <strings.h>
-],
-[int n = strcasecmp("a", "b");],
-[pgac_cv_header_strings_both=yes],
-[pgac_cv_header_strings_both=no])],
-[pgac_cv_header_strings_both=no])])
-if test x"$pgac_cv_header_strings_both" = x"yes"; then
-  AC_DEFINE([STRING_H_WITH_STRINGS_H], 1,
-            [Define if string.h and strings.h may both be included])
-fi])
-
-
-# PGAC_CHECK_MEMBER(AGGREGATE.MEMBER,
-#                   [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
-#                   [INCLUDES])
-# -----------------------------------------------------------
-
-AC_DEFUN([PGAC_CHECK_MEMBER],
-[changequote(<<, >>)dnl
-dnl The name to #define.
-define(<<pgac_define_name>>, translit(HAVE_$1, [a-z .*], [A-Z__P]))dnl
-dnl The cache variable name.
-define(<<pgac_cache_name>>, translit(pgac_cv_member_$1, [ .*], [__p]))dnl
-changequote([, ])dnl
-AC_CACHE_CHECK([for $1], [pgac_cache_name],
-[AC_TRY_COMPILE([$4],
-[static ]patsubst([$1], [\..*])[ pgac_var;
-if (pgac_var.]patsubst([$1], [^[^.]*\.])[)
-return 0;],
-[pgac_cache_name=yes],
-[pgac_cache_name=no])])
-
-if test x"[$]pgac_cache_name" = x"yes"; then
-  AC_DEFINE_UNQUOTED(pgac_define_name)
-  $2
-else
-  ifelse([$3], [], :, [$3])
-fi
-undefine([pgac_define_name])[]dnl
-undefine([pgac_cache_name])[]dnl
-])