Issue #17603: Check for st_blocks field without requiring fileblocks.o
diff --git a/Misc/NEWS b/Misc/NEWS
index 7516932..eef7f01 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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 --git a/configure b/configure
index a4847c3..9ff548f 100755
--- a/configure
+++ b/configure
@@ -12869,19 +12869,9 @@
_ACEOF
-$as_echo "#define HAVE_ST_BLOCKS 1" >>confdefs.h
-
-else
- case " $LIBOBJS " in
- *" fileblocks.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS fileblocks.$ac_objext"
- ;;
-esac
-
fi
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for time.h that defines altzone" >&5
$as_echo_n "checking for time.h that defines altzone... " >&6; }
if ${ac_cv_header_time_altzone+:} false; then :
diff --git a/configure.ac b/configure.ac
index bacb7b0..282610a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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 --git a/pyconfig.h.in b/pyconfig.h.in
index b0cafb3..e017d4e 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -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