Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 7cc514a

Browse files
committed
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
1 parent 72da68e commit 7cc514a

File tree

5 files changed

+6982
-5932
lines changed

5 files changed

+6982
-5932
lines changed

config/c-library.m4

+1-27
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Macros that test various C library quirks
2-
# $PostgreSQL: pgsql/config/c-library.m4,v 1.33 2008/08/21 13:53:28 petere Exp $
2+
# $PostgreSQL: pgsql/config/c-library.m4,v 1.34 2009/07/02 18:55:40 petere Exp $
33

44

55
# PGAC_VAR_INT_TIMEZONE
@@ -297,29 +297,3 @@ int main()
297297
])dnl AC_CACHE_VAL
298298
AC_MSG_RESULT([$pgac_cv_printf_arg_control])
299299
])# PGAC_FUNC_PRINTF_ARG_CONTROL
300-
301-
302-
# backport from Autoconf 2.61a
303-
# http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=f0c325537a22105536ac8c4e88656e50f9946486
304-
305-
# AC_FUNC_FSEEKO
306-
# --------------
307-
AN_FUNCTION([ftello], [AC_FUNC_FSEEKO])
308-
AN_FUNCTION([fseeko], [AC_FUNC_FSEEKO])
309-
AC_DEFUN([AC_FUNC_FSEEKO],
310-
[_AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1,
311-
[ac_cv_sys_largefile_source],
312-
[Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2).],
313-
[[#include <sys/types.h> /* for off_t */
314-
#include <stdio.h>]],
315-
[[int (*fp) (FILE *, off_t, int) = fseeko;
316-
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);]])
317-
318-
# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
319-
# in glibc 2.1.3, but that breaks too many other things.
320-
# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
321-
if test $ac_cv_sys_largefile_source != unknown; then
322-
AC_DEFINE(HAVE_FSEEKO, 1,
323-
[Define to 1 if fseeko (and presumably ftello) exists and is declared.])
324-
fi
325-
])# AC_FUNC_FSEEKO

config/general.m4

+1-18
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/config/general.m4,v 1.10 2008/10/29 09:27:24 petere Exp $
1+
# $PostgreSQL: pgsql/config/general.m4,v 1.11 2009/07/02 18:55:40 petere Exp $
22

33
# This file defines new macros to process configure command line
44
# arguments, to replace the brain-dead AC_ARG_WITH and AC_ARG_ENABLE.
@@ -33,7 +33,6 @@ m4_define([pgac_arg_to_variable],
3333

3434
AC_DEFUN([PGAC_ARG],
3535
[
36-
pgac_args="$pgac_args pgac_arg_to_variable([$1],[$2])"
3736
m4_case([$1],
3837
3938
enable, [
@@ -74,22 +73,6 @@ AC_ARG_WITH([$2], [AS_HELP_STRING([--]m4_if($3, -, without, with)[-$2]m4_if($3,
7473
)
7574
])# PGAC_ARG
7675

77-
# PGAC_ARG_CHECK()
78-
# ----------------
79-
# Checks if the user passed any --with/without/enable/disable
80-
# arguments that were not defined. Just prints out a warning message,
81-
# so this should be called near the end, so the user will see it.
82-
83-
AC_DEFUN([PGAC_ARG_CHECK],
84-
[for pgac_var in `set | sed 's/=.*//' | $EGREP 'with_|enable_'`; do
85-
for pgac_arg in $pgac_args with_gnu_ld; do
86-
if test "$pgac_var" = "$pgac_arg"; then
87-
continue 2
88-
fi
89-
done
90-
pgac_txt=`echo $pgac_var | sed 's/_/-/g'`
91-
AC_MSG_WARN([option ignored: --$pgac_txt])
92-
done])# PGAC_ARG_CHECK
9376

9477
# PGAC_ARG_BOOL(TYPE, NAME, DEFAULT, HELP-STRING-RHS,
9578
# [ACTION-IF-YES], [ACTION-IF-NO])

0 commit comments

Comments
 (0)