X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Flargefile.m4;h=515625dc267897a2ef54f1efa6874722c57a150a;hb=33b06b1c1f3f8af098c9b1918a86ac67c1f98657;hp=376e3a1c3bc45e0078665f6386ee4bdf0835c1d3;hpb=d892db3d13ca813a724b0a508dde06de6efd424c;p=gnulib.git

diff --git a/m4/largefile.m4 b/m4/largefile.m4
index 376e3a1c3..515625dc2 100644
--- a/m4/largefile.m4
+++ b/m4/largefile.m4
@@ -1,4 +1,4 @@
-#serial 7
+#serial 10
 
 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
@@ -103,14 +107,21 @@ AC_DEFUN(AC_SYS_LARGEFILE,
 [	hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)]
 	  ac_cv_sys_file_offset_bits=64 ;;
 	esac])
+     AC_SYS_LARGEFILE_MACRO_VALUE(_GNU_SOURCE,
+       ac_cv_sys_gnu_source,
+       [Define to make ftello visible on some hosts (e.g. glibc 2.1.3).],
+       [AC_TRY_COMPILE([#include <stdio.h>], [return !ftello;], ,
+	  [AC_TRY_COMPILE([#define _GNU_SOURCE 1
+#include <stdio.h>],
+	     [return !ftello;],
+	     ac_cv_sys_gnu_source=1)])])
      AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE,
        ac_cv_sys_largefile_source,
-       [Define to make fseeko etc. visible, on some hosts.],
-       [case "$host_os" in
-	# HP-UX 10.20 and later
-[	hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)]
-	  ac_cv_sys_largefile_source=1 ;;
-	esac])
+       [Define to make ftello visible on some hosts (e.g. HP-UX 10.20).],
+       [AC_TRY_COMPILE([#include <stdio.h>], [return !ftello;], ,
+	  [AC_TRY_COMPILE([#define _LARGEFILE_SOURCE 1
+#include <stdio.h>], [return !ftello;],
+	     ac_cv_sys_largefile_source=1)])])
      AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES,
        ac_cv_sys_large_files,
        [Define for large files, on AIX-style hosts.],