* lib/autoconf/specific.m4 (_AC_SYS_LARGEFILE_MACRO_VALUE):

If FUNCTION-BODY is nonempty, use AC_LINK_IFELSE rather than
AC_COMPILE_IFELSE, to work around problem with OSF/1 4.0F fseeko
reported by Nelson H. F. Beebe for Coreutils 6.4.

diff --git a/ChangeLog b/ChangeLog
index 5ad30557805c854e3bfb707d8095fc0c7ce226c4..a36b356369089337b5d00b081d8870f49cc52818 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-10-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/autoconf/specific.m4 (_AC_SYS_LARGEFILE_MACRO_VALUE):
+       If FUNCTION-BODY is nonempty, use AC_LINK_IFELSE rather than
+       AC_COMPILE_IFELSE, to work around problem with OSF/1 4.0F fseeko
+       reported by Nelson H. F. Beebe for Coreutils 6.4.
+
+       * tests/tools.at (autoconf --trace: user macros): Remove test
+       for tracing multiline macros, since m4 1.4.7a uses a different
+       way to number lines.  Problem reported by Ralf Wildenhues.
+
 2006-10-24  Stepan Kasal  <kasal@ucw.cz>
 
        * bin/autom4te.in (handle_m4): Do not redirect stdin to

diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index c77a7766e04d5ed4c81b659b048da3f54b52acbb..40bbfd48f5bfd60f7a5f11ccb401a7f718412933 100644 (file)
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -130,11 +130,13 @@ m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES],
 m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE],
 [AC_CACHE_CHECK([for $1 value needed for large files], [$3],
 [while :; do
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$5], [$6])],
-                   [$3=no; break])
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([@%:@define $1 $2
+  m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])(
+    [AC_LANG_PROGRAM([$5], [$6])],
+    [$3=no; break])
+  m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])(
+    [AC_LANG_PROGRAM([@%:@define $1 $2
 $5], [$6])],
-                   [$3=$2; break])
+    [$3=$2; break])
   $3=unknown
   break
 done])