Upgrade to Autoconf 2.63
This upgrades the configure infrastructure to the latest Autoconf version. Some notable news are: - The workaround for the broken fseeko() test is gone. - Checking for unknown options is now provided by Autoconf itself. - Fixes for Mac OS X
This commit is contained in:
Peter Eisentraut
parent
72da68eef0
commit
7cc514ac65
|
|
@ -1,5 +1,5 @@
|
|||
# Macros that test various C library quirks
|
||||
# $PostgreSQL: pgsql/config/c-library.m4,v 1.33 2008/08/21 13:53:28 petere Exp $
|
||||
# $PostgreSQL: pgsql/config/c-library.m4,v 1.34 2009/07/02 18:55:40 petere Exp $
|
||||
|
||||
|
||||
# PGAC_VAR_INT_TIMEZONE
|
||||
|
|
@ -297,29 +297,3 @@ int main()
|
|||
])dnl AC_CACHE_VAL
|
||||
AC_MSG_RESULT([$pgac_cv_printf_arg_control])
|
||||
])# PGAC_FUNC_PRINTF_ARG_CONTROL
|
||||
|
||||
|
||||
# backport from Autoconf 2.61a
|
||||
# http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=f0c325537a22105536ac8c4e88656e50f9946486
|
||||
|
||||
# AC_FUNC_FSEEKO
|
||||
# --------------
|
||||
AN_FUNCTION([ftello], [AC_FUNC_FSEEKO])
|
||||
AN_FUNCTION([fseeko], [AC_FUNC_FSEEKO])
|
||||
AC_DEFUN([AC_FUNC_FSEEKO],
|
||||
[_AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1,
|
||||
[ac_cv_sys_largefile_source],
|
||||
[Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2).],
|
||||
[[#include <sys/types.h> /* for off_t */
|
||||
#include <stdio.h>]],
|
||||
[[int (*fp) (FILE *, off_t, int) = fseeko;
|
||||
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);]])
|
||||
|
||||
# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
|
||||
# in glibc 2.1.3, but that breaks too many other things.
|
||||
# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
|
||||
if test $ac_cv_sys_largefile_source != unknown; then
|
||||
AC_DEFINE(HAVE_FSEEKO, 1,
|
||||
[Define to 1 if fseeko (and presumably ftello) exists and is declared.])
|
||||
fi
|
||||
])# AC_FUNC_FSEEKO
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $PostgreSQL: pgsql/config/general.m4,v 1.10 2008/10/29 09:27:24 petere Exp $
|
||||
# $PostgreSQL: pgsql/config/general.m4,v 1.11 2009/07/02 18:55:40 petere Exp $
|
||||
|
||||
# This file defines new macros to process configure command line
|
||||
# arguments, to replace the brain-dead AC_ARG_WITH and AC_ARG_ENABLE.
|
||||
|
|
@ -33,7 +33,6 @@ m4_define([pgac_arg_to_variable],
|
|||
|
||||
AC_DEFUN([PGAC_ARG],
|
||||
[
|
||||
pgac_args="$pgac_args pgac_arg_to_variable([$1],[$2])"
|
||||
m4_case([$1],
|
||||
|
||||
enable, [
|
||||
|
|
@ -74,22 +73,6 @@ AC_ARG_WITH([$2], [AS_HELP_STRING([--]m4_if($3, -, without, with)[-$2]m4_if($3,
|
|||
)
|
||||
])# PGAC_ARG
|
||||
|
||||
# PGAC_ARG_CHECK()
|
||||
# ----------------
|
||||
# Checks if the user passed any --with/without/enable/disable
|
||||
# arguments that were not defined. Just prints out a warning message,
|
||||
# so this should be called near the end, so the user will see it.
|
||||
|
||||
AC_DEFUN([PGAC_ARG_CHECK],
|
||||
[for pgac_var in `set | sed 's/=.*//' | $EGREP 'with_|enable_'`; do
|
||||
for pgac_arg in $pgac_args with_gnu_ld; do
|
||||
if test "$pgac_var" = "$pgac_arg"; then
|
||||
continue 2
|
||||
fi
|
||||
done
|
||||
pgac_txt=`echo $pgac_var | sed 's/_/-/g'`
|
||||
AC_MSG_WARN([option ignored: --$pgac_txt])
|
||||
done])# PGAC_ARG_CHECK
|
||||
|
||||
# PGAC_ARG_BOOL(TYPE, NAME, DEFAULT, HELP-STRING-RHS,
|
||||
# [ACTION-IF-YES], [ACTION-IF-NO])
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
dnl Process this file with autoconf to produce a configure script.
|
||||
dnl $PostgreSQL: pgsql/configure.in,v 1.603 2009/07/01 23:15:55 tgl Exp $
|
||||
dnl $PostgreSQL: pgsql/configure.in,v 1.604 2009/07/02 18:55:40 petere Exp $
|
||||
dnl
|
||||
dnl Developers, please strive to achieve this order:
|
||||
dnl
|
||||
|
|
@ -19,7 +19,7 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
|
|||
|
||||
AC_INIT([PostgreSQL], [8.5devel], [pgsql-bugs@postgresql.org])
|
||||
|
||||
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
|
||||
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
|
||||
Untested combinations of 'autoconf' and PostgreSQL versions are not
|
||||
recommended. You can remove the check from 'configure.in' but it is then
|
||||
your responsibility whether the result works or not.])])
|
||||
|
|
@ -1878,6 +1878,3 @@ AC_CONFIG_HEADERS([src/interfaces/ecpg/include/ecpg_config.h],
|
|||
[echo >src/interfaces/ecpg/include/stamp-h])
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
# Warn about unknown options
|
||||
PGAC_ARG_CHECK
|
||||
|
|
|
|||
|
|
@ -12,6 +12,9 @@
|
|||
/* Define to the return type of 'accept' */
|
||||
#undef ACCEPT_TYPE_RETURN
|
||||
|
||||
/* Define if building universal (internal helper macro) */
|
||||
#undef AC_APPLE_UNIVERSAL_BUILD
|
||||
|
||||
/* The normal alignment of `double', in bytes. */
|
||||
#undef ALIGNOF_DOUBLE
|
||||
|
||||
|
|
@ -761,9 +764,17 @@
|
|||
/* Define to select Win32-style shared memory. */
|
||||
#undef USE_WIN32_SHARED_MEMORY
|
||||
|
||||
/* Define to 1 if your processor stores words with the most significant byte
|
||||
first (like Motorola and SPARC, unlike Intel and VAX). */
|
||||
#undef WORDS_BIGENDIAN
|
||||
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
|
||||
significant byte first (like Motorola and SPARC, unlike Intel). */
|
||||
#if defined AC_APPLE_UNIVERSAL_BUILD
|
||||
# if defined __BIG_ENDIAN__
|
||||
# define WORDS_BIGENDIAN 1
|
||||
# endif
|
||||
#else
|
||||
# ifndef WORDS_BIGENDIAN
|
||||
# undef WORDS_BIGENDIAN
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* Size of a WAL file block. This need have no particular relation to BLCKSZ.
|
||||
XLOG_BLCKSZ must be a power of 2, and if your system supports O_DIRECT I/O,
|
||||
|
|
|
|||
Loading…
Reference in New Issue