From e4572180c3445ce1afdc9e36ab8c2163637e0755 Mon Sep 17 00:00:00 2001
From: Erik de Castro Lopo <erikd@mega-nerd.com>
Date: Mon, 14 Nov 2016 18:14:41 +1100
Subject: [PATCH] configure.ac: Fix detection of Large File Support

Support for files over 2 gigabytes has been broken for some time on
32 bit systems and no one noticed.
---
 configure.ac | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index e861a91d..cc0602b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -155,8 +155,6 @@ AC_CHECK_SIZEOF(long long,8)
 
 # Check for common 64 bit file offset types.
 AC_CHECK_SIZEOF(off_t,1)
-AC_CHECK_SIZEOF(loff_t,1)
-AC_CHECK_SIZEOF(off64_t,1)
 
 if test "$enable_largefile:$ac_cv_sizeof_off_t" = "no:8" ; then
 	echo
@@ -165,7 +163,6 @@ if test "$enable_largefile:$ac_cv_sizeof_off_t" = "no:8" ; then
 	exit 1
 	fi
 
-
 case "$host_os" in
 	mingw32*)
 		TYPEOF_SF_COUNT_T="__int64"
@@ -180,14 +177,6 @@ case "$host_os" in
 			TYPEOF_SF_COUNT_T="int64_t"
 			SF_COUNT_MAX="0x7FFFFFFFFFFFFFFFLL"
 			SIZEOF_SF_COUNT_T=8
-		elif test "x$ac_cv_sizeof_loff_t" = "x8" ; then
-			TYPEOF_SF_COUNT_T="int64_t"
-			SF_COUNT_MAX="0x7FFFFFFFFFFFFFFFLL"
-			SIZEOF_SF_COUNT_T=8
-		elif test "x$ac_cv_sizeof_off64_t" = "x8" ; then
-			TYPEOF_SF_COUNT_T="int64_t"
-			SF_COUNT_MAX="0x7FFFFFFFFFFFFFFFLL"
-			SIZEOF_SF_COUNT_T=8
 		else
 			# Save the old sizeof (off_t) value  and then unset it to see if it
 			# changes when Large File Support is enabled.
@@ -195,7 +184,6 @@ case "$host_os" in
 			unset ac_cv_sizeof_off_t
 
 			AC_SYS_LARGEFILE
-
 			if test "x$ac_cv_sys_largefile_CFLAGS" = "xno" ; then
 				ac_cv_sys_largefile_CFLAGS=""
 				fi
@@ -211,6 +199,7 @@ case "$host_os" in
 			if test "x$ac_cv_sizeof_off_t" = "x8" ; then
 				TYPEOF_SF_COUNT_T="int64_t"
 				SF_COUNT_MAX="0x7FFFFFFFFFFFFFFFLL"
+				SIZEOF_SF_COUNT_T=8
 			elif test "x$TYPEOF_SF_COUNT_T" = "xunknown" ; then
 				echo
 				echo "*** The configure process has determined that this system is capable"