Backport fixed AC_FUNC_FSEEKO

petere · petere · commit 95ea526e2165 · 2008-02-19T18:02:30.000Z
diff --git a/config/c-library.m4 b/config/c-library.m4
@@ -1,5 +1,5 @@
 # Macros that test various C library quirks
-# $PostgreSQL: pgsql/config/c-library.m4,v 1.31 2005/02/24 01:34:45 tgl Exp $
+# $PostgreSQL: pgsql/config/c-library.m4,v 1.32 2008/02/19 18:02:30 petere Exp $
 
 
 # PGAC_VAR_INT_TIMEZONE
@@ -297,3 +297,29 @@ int main()
 ])dnl AC_CACHE_VAL
 AC_MSG_RESULT([$pgac_cv_printf_arg_control])
 ])# PGAC_FUNC_PRINTF_ARG_CONTROL
+
+
+# backport from Autoconf 2.61a
+# http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=f0c325537a22105536ac8c4e88656e50f9946486
+
+# AC_FUNC_FSEEKO
+# --------------
+AN_FUNCTION([ftello], [AC_FUNC_FSEEKO])
+AN_FUNCTION([fseeko], [AC_FUNC_FSEEKO])
+AC_DEFUN([AC_FUNC_FSEEKO],
+[_AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1,
+   [ac_cv_sys_largefile_source],
+   [Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2).],
+   [[#include <sys/types.h> /* for off_t */
+     #include <stdio.h>]],
+   [[int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);]])
+
+# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+# in glibc 2.1.3, but that breaks too many other things.
+# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+if test $ac_cv_sys_largefile_source != unknown; then
+  AC_DEFINE(HAVE_FSEEKO, 1,
+    [Define to 1 if fseeko (and presumably ftello) exists and is declared.])
+fi
+])# AC_FUNC_FSEEKO
diff --git a/configure b/configure
@@ -18051,11 +18051,13 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
 int
 main ()
 {
-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
   ;
   return 0;
 }
@@ -18095,11 +18097,13 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #define _LARGEFILE_SOURCE 1
-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
 int
 main ()
 {
-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
   ;
   return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -18051,11 +18051,13 @@ _ACEOF`
`18051`	`18051`	`cat confdefs.h >>conftest.$ac_ext`
`18052`	`18052`	`cat >>conftest.$ac_ext <<_ACEOF`
`18053`	`18053`	`/* end confdefs.h. */`
`18054`		`-#include <stdio.h>`
	`18054`	`+#include <sys/types.h> /* for off_t */`
	`18055`	`+ #include <stdio.h>`
`18055`	`18056`	`int`
`18056`	`18057`	`main ()`
`18057`	`18058`	`{`
`18058`		`-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);`
	`18059`	`+int (fp) (FILE , off_t, int) = fseeko;`
	`18060`	`+ return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);`
`18059`	`18061`	`;`
`18060`	`18062`	`return 0;`
`18061`	`18063`	`}`
`@@ -18095,11 +18097,13 @@ cat confdefs.h >>conftest.$ac_ext`
`18095`	`18097`	`cat >>conftest.$ac_ext <<_ACEOF`
`18096`	`18098`	`/* end confdefs.h. */`
`18097`	`18099`	`#define _LARGEFILE_SOURCE 1`
`18098`		`-#include <stdio.h>`
	`18100`	`+#include <sys/types.h> /* for off_t */`
	`18101`	`+ #include <stdio.h>`
`18099`	`18102`	`int`
`18100`	`18103`	`main ()`
`18101`	`18104`	`{`
`18102`		`-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);`
	`18105`	`+int (fp) (FILE , off_t, int) = fseeko;`
	`18106`	`+ return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);`
`18103`	`18107`	`;`
`18104`	`18108`	`return 0;`
`18105`	`18109`	`}`