Re: mkoctfile.cc.in: nontrivial merge of stable to default?

[Jordi Gutiérrez Hermoso]

2011/9/11 Michael Goffioul <address@hidden>:
> 2011/9/11 Jordi Gutiérrez Hermoso <address@hidden>:

>> Before I push a merge of stable to default I just made, I want to
>> confirm that I correctly resolved the merge conflict of
>> mkoctfile.cc.in. Since the last merge of stable to default,
>> mkoctfile.cc.in has only seen one cset on the stable branch by
>> Michael Goffioul
>>
>>    http://hg.savannah.gnu.org/hgweb/octave/rev/50a27a3b5131
>>
>> which added LAPACK_LIBS to the link command. When jwe was improving
>> our linking, he changed the way linking options are passed, so
>> there was a merge conflict on this line. I believe the LAPACK_LIBS
>> are now completely handled by jwe's changes,
>>
>>    http://hg.savannah.gnu.org/hgweb/octave/rev/edc5ec6e949b#l8.64
>>
>> so I want to confirm that replacing Michael's changes with
>> jwe's on this line is correct.
>
> Yes, that's the correct way to handle the merge.

Okay, thanks, I've made the merge.

- Jordi G. H.