[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: libtool.m4 usage of diff when comparing files
From: |
Bob Friesenhahn |
Subject: |
Re: libtool.m4 usage of diff when comparing files |
Date: |
Sat, 24 Apr 2010 20:02:30 -0500 (CDT) |
User-agent: |
Alpine 2.01 (GSO 1266 2009-07-14) |
On Sat, 24 Apr 2010, Alfred M. Szmidt wrote:
Sorry, the previous patch was munged, here is the correct one.
I assume that this patch is reversed?
Bob
diff -ur libltdl/m4/libtool.m4 libltdl/m4/libtool.m4.~1~
--- libltdl/m4/libtool.m4 2010-04-24 19:35:27.074101220 +0200
+++ libltdl/m4/libtool.m4.~1~ 2009-11-16 14:11:59.000000000 +0100
@@ -1426,7 +1426,7 @@
# So say no if there are warnings other than the usual output.
$ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || cmp conftest.exp conftest.er2 >/dev/null;
then
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null;
then
$2=yes
fi
fi
@@ -1466,7 +1466,7 @@
cat conftest.err 1>&AS_MESSAGE_LOG_FD
$ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if cmp conftest.exp conftest.er2 >/dev/null; then
+ if diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
fi
else
@@ -1880,7 +1880,7 @@
# So say no if there are warnings
$ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
- if test ! -s out/conftest.er2 || cmp out/conftest.exp out/conftest.er2
>/dev/null; then
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2
>/dev/null; then
_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
fi
fi
_______________________________________________
Bug-libtool mailing list
address@hidden
http://lists.gnu.org/mailman/listinfo/bug-libtool
--
Bob Friesenhahn
address@hidden, http://www.simplesystems.org/users/bfriesen/
GraphicsMagick Maintainer, http://www.GraphicsMagick.org/