Re: 43-load-header-vars-once.patch

[Tom Tromey]

>>>>> "Akim" == Akim Demaille <address@hidden> writes:

Akim> I had to write this one under the pressure of variable_define
Akim> which doesn't want one variable to be defined several times.
Akim> Given that it was due to a hack, fixing it using the regular
Akim> mechanism seems the right choice.  In addition the code is much
Akim> smaller.

Yes, the re-reading was always a hack.  Removing it is a good idea
provided of course that semantically things remain the same.

Akim>   Avoid reading twice header-vars.am as now variable_define
Akim>   complains.
Akim>   * automake.in (&define_standard_variables): Don't output the
Akim>   variables.
Akim>   (&read_main_am_file): Output first user variables, then Automake
Akim>   variables.
Akim>   Don't call twice &define_standard_variables.
Akim>   Save variable comments in $am_vars.
Akim>   (&variable_output): New.
Akim>   (&file_contents_internal): New.
Akim>   Save variable comments in $am_vars.
Akim>   (&file_contents): Use it.

Ok.

Tom