autoconf-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNU Autoconf 2.59c] diff might generate output for identical files


From: Ralf Menzel
Subject: [GNU Autoconf 2.59c] diff might generate output for identical files
Date: Wed, 08 Jun 2005 16:31:59 +0200
User-agent: Gnus/5.1006 (Gnus v5.10.6) XEmacs/21.4 (Reasonable Discussion, usg-unix-v)

Hi,

I would like to propose a patch that addresses a peculiarity of
Solaris 9 diff. Watch:

--- snip ---
bash> diff -u /dev/null /dev/null
No differences encountered
--- snip ---

That is, the diff of Solaris 9 understands the option `-u' to generate
unified context diffs, but it emits a message (on stdout) of the files
it compares are identical. Unfortunately, this is contrary to use of
diff in _AT_CHECK (and probably other places).

Here is the patch that I propose:
--- snip ---
Index: lib/autotest/general.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autotest/general.m4,v
retrieving revision 1.183
diff -u -p -r1.183 general.m4
--- lib/autotest/general.m4     7 Jun 2005 13:03:09 -0000       1.183
+++ lib/autotest/general.m4     8 Jun 2005 13:20:41 -0000
@@ -610,7 +610,10 @@ else
 fi
 
 # Use `diff -u' when possible.
-if diff -u "$at_devnull" "$at_devnull" >/dev/null 2>&1; then
+if diff -u "$at_devnull" "$at_devnull" >"$at_stdout" 2>"$at_stderr" &&
+  diff "$at_stdout" "$at_devnull" >/dev/null 2>&1 &&
+  diff "$at_stderr" "$at_devnull" >/dev/null 2>&1
+then
   at_diff='diff -u'
 else
   at_diff=diff
--- snip ---

Bye,
Ralf Menzel




reply via email to

[Prev in Thread] Current Thread [Next in Thread]