From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 24 Oct 2006 19:34:09 +0000 (+0000)
Subject: * lib/autoconf/specific.m4 (_AC_SYS_LARGEFILE_MACRO_VALUE):
X-Git-Tag: AUTOCONF-2.61~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7736fa2754db830a05eea6c21b9449cdddc412be;p=thirdparty%2Fautoconf.git

* 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 5ad305578..a36b35636 100644
--- 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 c77a7766e..40bbfd48f 100644
--- 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])