[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Octave's m4/acx_pthread.m4 & OSX
From: |
Ben Abbott |
Subject: |
Re: Octave's m4/acx_pthread.m4 & OSX |
Date: |
Tue, 07 Sep 2010 20:16:23 -0400 |
On Sep 7, 2010, at 5:12 PM, bpabbott wrote:
> On 07 Sep, 2010,at 04:45 PM, "John W. Eaton" <address@hidden> wrote:
>
>> On 7-Sep-2010, bpabbott wrote:
>>
>> | My build was successful ... this change was much easier than I'd expected.
>> | Since I'm in unfamiliar waters, it would be wise to someone more
>> knowledgeable
>> | to check the changeset before it is committed.
>>
>> When moving/renaming files, it is probably best to use "hg rename" for
>> each file so that Mercurial knows about the name change. At least I
>> think that is how it is supposed to work. So in the case of
>> acx_pthreadm4, I would do
>>
>> hg rename acx_pthread.m4 ax_pthread.m4
>> cp new-ax_pthread.m4 ax_pthread.m4
>>
>> This will allow Mercurial to generate a more compact diff that looks
>> like this:
>>
>> diff --git a/m4/acx_pthread.m4 b/m4/ax_pthread.m4
>> rename from m4/acx_pthread.m4
>> rename to m4/ax_pthread.m4
>> --- a/m4/acx_pthread.m4
>> +++ b/m4/ax_pthread.m4
>> @@ -1,10 +1,10 @@
>> # ===========================================================================
>> -# http://www.nongnu.org/autoconf-archive/acx_pthread.html
>> +# http://www.gnu.org/software/autoconf-archive/ax_pthread.html
>> # ===========================================================================
>> #
>> # SYNOPSIS
>> #
>> -# ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
>> +# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
>> #
>> # DESCRIPTION
>> #
>> ...
>> ...
>> ...
>>
>> instead of showing only that one file was deleted and another was added.
>>
>> Will you please rework the changeset to use this method of renaming
>> and modifying the files?
>>
>> I'd also recommend that you add
>>
>> [diff]
>> git = 1
>>
>> to your ~/.hgrc file.
>>
>> Finally, it's a nit, but I think you mean ax_*.m4, not ac_*.m4 in the
>> ChangeLog entry.
>>
>> Thanks,
>>
>> jwe
>
> Thanks for the quick response. The updated version is attached.
>
> I'm building with it now.
>
> Ben
> <changeset-m4.patch>
"make check" gave no errors. I've pushed the changeset.
Ben
- Re: Octave's m4/acx_pthread.m4 & OSX, (continued)
- Re: Octave's m4/acx_pthread.m4 & OSX, Jarno Rajahalme, 2010/09/07
- Re: Octave's m4/acx_pthread.m4 & OSX, Ben Abbott, 2010/09/07
- Re: Octave's m4/acx_pthread.m4 & OSX, John W. Eaton, 2010/09/07
- Re: Octave's m4/acx_pthread.m4 & OSX, Thomas Treichl, 2010/09/07
- Re: Octave's m4/acx_pthread.m4 & OSX, bpabbott, 2010/09/07
- Re: Octave's m4/acx_pthread.m4 & OSX, Thomas Treichl, 2010/09/07
- Re: Octave's m4/acx_pthread.m4 & OSX, bpabbott, 2010/09/07
- Re: Octave's m4/acx_pthread.m4 & OSX, bpabbott, 2010/09/07
- Re: Octave's m4/acx_pthread.m4 & OSX, John W. Eaton, 2010/09/07
- Re: Octave's m4/acx_pthread.m4 & OSX, bpabbott, 2010/09/07
- Re: Octave's m4/acx_pthread.m4 & OSX,
Ben Abbott <=
- Re: Octave's m4/acx_pthread.m4 & OSX, Jaroslav Hajek, 2010/09/08
Re: Octave's m4/acx_pthread.m4 & OSX, Thomas Treichl, 2010/09/07