From d9bb1ae90d7f678142b0654701cc061aa70eb9ca Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Thu, 6 Apr 2000 06:55:14 +0000
Subject: [PATCH] (AC_SYS_LARGEFILE_FLAGS): Don't use -n32 on IRIX if the
 installer said otherwise.

---
 m4/largefile.m4 | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/m4/largefile.m4 b/m4/largefile.m4
index 32d27ccbe2..576a7ecc18 100644
--- a/m4/largefile.m4
+++ b/m4/largefile.m4
@@ -1,4 +1,4 @@
-#serial 8
+#serial 9
 
 dnl By default, many hosts won't let programs access large files;
 dnl one must use special compiler options to get large-file access to work.
@@ -25,10 +25,14 @@ AC_DEFUN(AC_SYS_LARGEFILE_FLAGS,
 	       ac_cv_sys_largefile_CFLAGS=-D__STDC_EXT__
 	     fi
 	     ;;
-	   # IRIX 6.2 and later require cc -n32.
+	   # IRIX 6.2 and later do not support large files by default,
+	   # so use the -n32 ABI unless the installer said otherwise.
 [	   irix6.[2-9]* | irix6.1[0-9]* | irix[7-9].* | irix[1-9][0-9]*)]
 	     if test "$GCC" != yes; then
-	       ac_cv_sys_largefile_CFLAGS=-n32
+	       case "$CC $CFLAGS " in
+	       *' -o32 '*|*' -n32 '*|*' -64 '*) ;;
+	       *) ac_cv_sys_largefile_CFLAGS=-n32 ;;
+	       esac
 	     fi
 	   esac
 	   if test "$ac_cv_sys_largefile_CFLAGS" != no; then
-- 
2.30.2