changeset:   100569:0774398c3433
branch:      3.5
parent:      100566:ce62df22f3bf
user:        Martin Panter <vadmium+py@gmail.com>
date:        Fri Mar 18 02:36:41 2016 +0000
files:       Misc/NEWS configure configure.ac pyconfig.h.in
description:
Issue #17603: Check for st_blocks field without requiring fileblocks.o


diff -r ce62df22f3bf -r 0774398c3433 Misc/NEWS
--- a/Misc/NEWS	Wed Mar 16 23:19:15 2016 +0100
+++ b/Misc/NEWS	Fri Mar 18 02:36:41 2016 +0000
@@ -319,6 +319,9 @@
 Build
 -----
 
+- Issue #17603: Avoid error about nonexistant fileblocks.o file by using a
+  lower-level check for st_blocks in struct stat.
+
 - Issue #26079: Fixing the build output folder for tix-8.4.3.6. Patch by
   Bjoern Thiel.
 
diff -r ce62df22f3bf -r 0774398c3433 configure
--- a/configure	Wed Mar 16 23:19:15 2016 +0100
+++ b/configure	Fri Mar 18 02:36:41 2016 +0000
@@ -12869,17 +12869,7 @@
 _ACEOF
 
 
-$as_echo "#define HAVE_ST_BLOCKS 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" fileblocks.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS fileblocks.$ac_objext"
- ;;
-esac
-
-fi
-
+fi
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for time.h that defines altzone" >&5
diff -r ce62df22f3bf -r 0774398c3433 configure.ac
--- a/configure.ac	Wed Mar 16 23:19:15 2016 +0100
+++ b/configure.ac	Fri Mar 18 02:36:41 2016 +0000
@@ -3727,7 +3727,7 @@
 AC_CHECK_MEMBERS([struct stat.st_flags])
 AC_CHECK_MEMBERS([struct stat.st_gen])
 AC_CHECK_MEMBERS([struct stat.st_birthtime])
-AC_STRUCT_ST_BLOCKS
+AC_CHECK_MEMBERS([struct stat.st_blocks])
 
 AC_MSG_CHECKING(for time.h that defines altzone)
 AC_CACHE_VAL(ac_cv_header_time_altzone,[
diff -r ce62df22f3bf -r 0774398c3433 pyconfig.h.in
--- a/pyconfig.h.in	Wed Mar 16 23:19:15 2016 +0100
+++ b/pyconfig.h.in	Fri Mar 18 02:36:41 2016 +0000
@@ -934,10 +934,6 @@
 /* Define to 1 if `tm_zone' is a member of `struct tm'. */
 #undef HAVE_STRUCT_TM_TM_ZONE
 
-/* Define to 1 if your `struct stat' has `st_blocks'. Deprecated, use
-   `HAVE_STRUCT_STAT_ST_BLOCKS' instead. */
-#undef HAVE_ST_BLOCKS
-
 /* Define if you have the 'symlink' function. */
 #undef HAVE_SYMLINK