From: Akim Demaille Date: Thu, 16 Nov 2000 08:52:54 +0000 (+0000) Subject: * m4/largefile.m4 (_AC_SYS_LARGEFILE_SOURCE): Remove, replaced by... X-Git-Tag: autoconf-2.50~417 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae4c79d26485edecef310aecea07574169f0bd80;p=thirdparty%2Fautoconf.git * m4/largefile.m4 (_AC_SYS_LARGEFILE_SOURCE): Remove, replaced by... (_AC_SYS_LARGEFILE_TEST_INCLUDES): this. (AC_SYS_LARGEFILE_MACRO_VALUE): Use AC_LANG_PROGRAM instead of _AC_SYS_LARGEFILE_SOURCE, i.e., don't pass _AC_SYS_LARGEFILE_TEST_INCLUDES by default: this isn't desirable when checking for fseeko. (AC_SYS_LARGEFILE): Pass AC_SYS_LARGEFILE_TEST_INCLUDES to _AC_SYS_LARGEFILE_MACRO_VALUE, since it no longer does this for us. --- diff --git a/ChangeLog b/ChangeLog index 9db3e81cc..b0498601b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2000-11-16 Paul Eggert + + * m4/largefile.m4 (_AC_SYS_LARGEFILE_SOURCE): Remove, replaced by... + (_AC_SYS_LARGEFILE_TEST_INCLUDES): this. + (AC_SYS_LARGEFILE_MACRO_VALUE): Use AC_LANG_PROGRAM instead of + _AC_SYS_LARGEFILE_SOURCE, i.e., don't pass + _AC_SYS_LARGEFILE_TEST_INCLUDES by default: this isn't desirable + when checking for fseeko. + (AC_SYS_LARGEFILE): Pass AC_SYS_LARGEFILE_TEST_INCLUDES to + _AC_SYS_LARGEFILE_MACRO_VALUE, since it no longer does this for us. + 2000-11-16 Akim Demaille Provide a means for escaping the forbidden patterns test. diff --git a/acfunctions.m4 b/acfunctions.m4 index 8e6e00620..e499f2bab 100644 --- a/acfunctions.m4 +++ b/acfunctions.m4 @@ -379,7 +379,7 @@ AU_ALIAS([fp_FUNC_FNMATCH], [AC_FUNC_FNMATCH]) AC_DEFUN([AC_FUNC_FSEEKO], [_AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1, [ac_cv_sys_largefile_source], - [Define to make fseeko visible on some hosts (e.g. HP-UX 10.20).], + [Define to make fseeko visible on some hosts (e.g. glibc 2.2).], [@%:@include ], [return !fseeko;]) # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug diff --git a/acspecific.m4 b/acspecific.m4 index 7b4357418..7c23c9b0d 100644 --- a/acspecific.m4 +++ b/acspecific.m4 @@ -623,14 +623,12 @@ AU_DEFUN([AC_ARG_ARRAY], with arguments. Remove this warning when you adjust your code.])]) -# _AC_SYS_LARGEFILE_SOURCE(PROLOGUE, BODY) -# ---------------------------------------- -m4_define([_AC_SYS_LARGEFILE_SOURCE], -[AC_LANG_PROGRAM( -[$1 -@%:@include -int a[[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]];], -[$2])]) +# _AC_SYS_LARGEFILE_TEST_INCLUDES +# ------------------------------- +m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES], +[@%:@include +int a[[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]];[]dnl +]) # _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, @@ -642,9 +640,9 @@ m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE], [AC_CACHE_CHECK([for $1 value needed for large files], [$3], [while :; do $3=no - AC_COMPILE_IFELSE([_AC_SYS_LARGEFILE_SOURCE([$5], [$6])], + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$5], [$6])], [break]) - AC_COMPILE_IFELSE([_AC_SYS_LARGEFILE_SOURCE([@%:@define $1 $2 + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([@%:@define $1 $2 $5], [$6])], [$3=$2; break]) break @@ -690,10 +688,12 @@ if test "$enable_largefile" != no; then _AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64, ac_cv_sys_file_offset_bits, - [Number of bits in a file offset, on hosts where this is settable.]) + [Number of bits in a file offset, on hosts where this is settable.], + [_AC_SYS_LARGEFILE_TEST_INCLUDES]) _AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, ac_cv_sys_large_files, - [Define for large files, on AIX-style hosts.]) + [Define for large files, on AIX-style hosts.], + [_AC_SYS_LARGEFILE_TEST_INCLUDES]) fi ])# AC_SYS_LARGEFILE diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4 index 8e6e00620..e499f2bab 100644 --- a/lib/autoconf/functions.m4 +++ b/lib/autoconf/functions.m4 @@ -379,7 +379,7 @@ AU_ALIAS([fp_FUNC_FNMATCH], [AC_FUNC_FNMATCH]) AC_DEFUN([AC_FUNC_FSEEKO], [_AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1, [ac_cv_sys_largefile_source], - [Define to make fseeko visible on some hosts (e.g. HP-UX 10.20).], + [Define to make fseeko visible on some hosts (e.g. glibc 2.2).], [@%:@include ], [return !fseeko;]) # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 index 7b4357418..7c23c9b0d 100644 --- a/lib/autoconf/specific.m4 +++ b/lib/autoconf/specific.m4 @@ -623,14 +623,12 @@ AU_DEFUN([AC_ARG_ARRAY], with arguments. Remove this warning when you adjust your code.])]) -# _AC_SYS_LARGEFILE_SOURCE(PROLOGUE, BODY) -# ---------------------------------------- -m4_define([_AC_SYS_LARGEFILE_SOURCE], -[AC_LANG_PROGRAM( -[$1 -@%:@include -int a[[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]];], -[$2])]) +# _AC_SYS_LARGEFILE_TEST_INCLUDES +# ------------------------------- +m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES], +[@%:@include +int a[[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]];[]dnl +]) # _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, @@ -642,9 +640,9 @@ m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE], [AC_CACHE_CHECK([for $1 value needed for large files], [$3], [while :; do $3=no - AC_COMPILE_IFELSE([_AC_SYS_LARGEFILE_SOURCE([$5], [$6])], + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$5], [$6])], [break]) - AC_COMPILE_IFELSE([_AC_SYS_LARGEFILE_SOURCE([@%:@define $1 $2 + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([@%:@define $1 $2 $5], [$6])], [$3=$2; break]) break @@ -690,10 +688,12 @@ if test "$enable_largefile" != no; then _AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64, ac_cv_sys_file_offset_bits, - [Number of bits in a file offset, on hosts where this is settable.]) + [Number of bits in a file offset, on hosts where this is settable.], + [_AC_SYS_LARGEFILE_TEST_INCLUDES]) _AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, ac_cv_sys_large_files, - [Define for large files, on AIX-style hosts.]) + [Define for large files, on AIX-style hosts.], + [_AC_SYS_LARGEFILE_TEST_INCLUDES]) fi ])# AC_SYS_LARGEFILE