Changing configure.ac script

[Nikolay Sivov]

Is there any way not to include a regenerated 'configure' script into a 
patch but be able to 'git fetch' it when it's changed remotely in repo?

As I see there is no need to patch a 'configure' file in repository 
since it's always regenerated when 'configure.ac' changed.

Thanks in advance.

[Vitaliy Margolen]

Nikolay Sivov wrote:
> Is there any way not to include a regenerated 'configure' script into a 
> patch but be able to 'git fetch' it when it's changed remotely in repo?
>
> As I see there is no need to patch a 'configure' file in repository 
> since it's always regenerated when 'configure.ac' changed.

Create two patches. One with changes to configure.ac and possibly other
changes another with configure only. Of course you send only former to
wine-patch. Then if you version of automake matches to the one AJ uses, git
rebase will automatically throw away the later patch for being already
applied upstream. Or you can always skip this patch during rebase.

Same applies to any other automatically generated files.

Vitaliy

[Nikolay Sivov]

Vitaliy Margolen wrote:
> Nikolay Sivov wrote:
> > Is there any way not to include a regenerated 'configure' script into a 
> > patch but be able to 'git fetch' it when it's changed remotely in repo?
> >
> > As I see there is no need to patch a 'configure' file in repository 
> > since it's always regenerated when 'configure.ac' changed.
>
> Create two patches. One with changes to configure.ac and possibly other
> changes another with configure only. Of course you send only former to
> wine-patch. Then if you version of automake matches to the one AJ uses, git
> rebase will automatically throw away the later patch for being already
> applied upstream. Or you can always skip this patch during rebase.
>
> Same applies to any other automatically generated files.
>
> Vitaliy

So I first of all send the one with new configure.ac and then second 
with regenerated configure (by mine autoconf).
Alexandre applies them as series and then regenerates by his autoconf? 
Or he regenerate it after first one? That will lead
to a second patch to fail if our versions (i.e. autoconf outputs) are 
not the same.

[Vitaliy Margolen]

Nikolay Sivov wrote:
> Vitaliy Margolen wrote:
> > Nikolay Sivov wrote:
> > > Is there any way not to include a regenerated 'configure' script into
> > > a patch but be able to 'git fetch' it when it's changed remotely in
> > > repo?
> > >
> > > As I see there is no need to patch a 'configure' file in repository
> > > since it's always regenerated when 'configure.ac' changed.
> >
> > Create two patches. One with changes to configure.ac and possibly other
> > changes another with configure only. Of course you send only former to
> > wine-patch. Then if you version of automake matches to the one AJ
> > uses, git
> > rebase will automatically throw away the later patch for being already
> > applied upstream. Or you can always skip this patch during rebase.
> >
> > Same applies to any other automatically generated files.
>
> So I first of all send the one with new configure.ac and then second
> with regenerated configure (by mine autoconf).

No you don't need to send patches for any automatically generated files. So
that means you do not send patch with changes to configure. Just keep it in
your tree until your other patch(es) get committed.

Vitaliy

[Nikolay Sivov]

Vitaliy Margolen wrote:
> Nikolay Sivov wrote:
> > Vitaliy Margolen wrote:
> > > Nikolay Sivov wrote:
> > > > Is there any way not to include a regenerated 'configure' script into
> > > > a patch but be able to 'git fetch' it when it's changed remotely in
> > > > repo?
> > > >
> > > > As I see there is no need to patch a 'configure' file in repository
> > > > since it's always regenerated when 'configure.ac' changed.
> > >
> > > Create two patches. One with changes to configure.ac and possibly other
> > > changes another with configure only. Of course you send only former to
> > > wine-patch. Then if you version of automake matches to the one AJ
> > > uses, git
> > > rebase will automatically throw away the later patch for being already
> > > applied upstream. Or you can always skip this patch during rebase.
> > >
> > > Same applies to any other automatically generated files.
> >
> > So I first of all send the one with new configure.ac and then second
> > with regenerated configure (by mine autoconf).
>
> No you don't need to send patches for any automatically generated files. So
> that means you do not send patch with changes to configure. Just keep it in
> your tree until your other patch(es) get committed.
>
> Vitaliy

Ok, thank you.