build: update gnulib submodule to latest

* src/merge.c (compute_changes): The TOO_EXPENSIVE heuristic in diffseq has
been removed, including compareseq's find_minimal parameter and the context's
too_expensive limit.  Adjust.
This commit is contained in:
Andreas Gruenbacher 2014-11-26 17:02:34 +01:00 committed by Andreas Gruenbacher
parent 65193f1cc1
commit 3fd4144ae9
3 changed files with 4 additions and 6 deletions

2
gnulib

@ -1 +1 @@
Subproject commit 77b054428b11be9cd76d1e3b0a7cd7cf86053173
Subproject commit 1b6c775c6b9c8054afcadc0aeb0ae39e81dc6387

5
m4/.gitignore vendored
View File

@ -37,7 +37,6 @@
/gnulib-tool.m4
/hash.m4
/include_next.m4
/inline.m4
/intmax_t.m4
/inttypes_h.m4
/largefile.m4
@ -165,7 +164,6 @@ gnulib-comp.m4
gnulib-tool.m4
hash.m4
include_next.m4
inline.m4
intmax_t.m4
inttypes_h.m4
lchmod.m4
@ -244,7 +242,8 @@ xsize.m4
xstrndup.m4
xvasprintf.m4
/close.m4
/gl_list.m4
/off_t.m4
/sys_types_h.m4
/extern-inline.m4
/absolute-header.m4
/secure_getenv.m4

View File

@ -564,9 +564,8 @@ compute_changes (lin xmin, lin xmax, lin ymin, lin ymax,
ctxt.bdiag += ymax + 1;
ctxt.heuristic = true;
ctxt.too_expensive = xmax + ymax;
compareseq (xmin, xmax, ymin, ymax, true, &ctxt);
compareseq (xmin, xmax, ymin, ymax, &ctxt);
ctxt.fdiag -= ymax + 1;
free (ctxt.fdiag);