From: Paul Eggert Date: Wed, 16 Jan 2013 17:35:20 +0000 (-0800) Subject: largefile: port better to Mac OS X 10.5 X-Git-Tag: v0.1~243 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=d4027e3c77dfd69b191e40c7d1e3652b2af50016;p=gnulib.git largefile: port better to Mac OS X 10.5 This patch is backported from Autoconf git. * m4/largefile.m4 (AC_SYS_LARGEFILE): Use AC_DEFINE, not AH_VERBATIM, to define _DARWIN_USE_64_BIT_INODE, to avoid problems with ino_t size being different for configuration time versus build/run time. Problem reported by PHO in . --- diff --git a/ChangeLog b/ChangeLog index 1cdc89f10e..c692ff0bb2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2013-01-16 Paul Eggert + + largefile: port better to Mac OS X 10.5 + This patch is backported from Autoconf git. + * m4/largefile.m4 (AC_SYS_LARGEFILE): Use AC_DEFINE, not + AH_VERBATIM, to define _DARWIN_USE_64_BIT_INODE, to avoid problems + with ino_t size being different for configuration time versus + build/run time. Problem reported by PHO in + . + 2013-01-15 Paul Eggert doc: clarify -Werror diff --git a/m4/largefile.m4 b/m4/largefile.m4 index 62f2b1403c..3d51c45fa1 100644 --- a/m4/largefile.m4 +++ b/m4/largefile.m4 @@ -5,9 +5,10 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# The following implementation works around a problem in autoconf <= 2.68; -# AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5. -m4_version_prereq([2.69], [] ,[ +# The following implementation works around a problem in autoconf <= 2.70; +# AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, +# or configures them incorrectly in some cases. +m4_version_prereq([2.70], [] ,[ # _AC_SYS_LARGEFILE_TEST_INCLUDES # ------------------------------- @@ -25,9 +26,9 @@ m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES], # _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, -# CACHE-VAR, -# DESCRIPTION, -# PROLOGUE, [FUNCTION-BODY]) +# CACHE-VAR, +# DESCRIPTION, +# PROLOGUE, [FUNCTION-BODY]) # -------------------------------------------------------- m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE], [AC_CACHE_CHECK([for $1 value needed for large files], [$3], @@ -93,15 +94,11 @@ if test "$enable_largefile" != no; then [_AC_SYS_LARGEFILE_TEST_INCLUDES]) fi - AH_VERBATIM([_DARWIN_USE_64_BIT_INODE], -[/* Enable large inode numbers on Mac OS X. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif]) + AC_DEFINE([_DARWIN_USE_64_BIT_INODE], [1], + [Enable large inode numbers on Mac OS X 10.5.]) fi ])# AC_SYS_LARGEFILE - -])# m4_version_prereq 2.69 +])# m4_version_prereq 2.70 # Enable large files on systems where this is implemented by Gnulib, not by the # system headers.