diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/c-library.m4 | 28 | ||||
| -rw-r--r-- | config/general.m4 | 19 |
2 files changed, 2 insertions, 45 deletions
diff --git a/config/c-library.m4 b/config/c-library.m4 index 74754b20e8..5d44685ec0 100644 --- a/config/c-library.m4 +++ b/config/c-library.m4 @@ -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 diff --git a/config/general.m4 b/config/general.m4 index aa3413b316..52f850ea25 100644 --- a/config/general.m4 +++ b/config/general.m4 @@ -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]) |