[Graham Bloice <graham.bloice@xxxxxxxxxxxxx>]

On 21 August 2014 13:24, Gisle Vanem <gvanem@xxxxxxxx> wrote:

"Guy Harris" <guy@xxxxxxxxxxxx> wrote:

Presumably autotools can be convinced to generate ws_config.h rather than config.h.

I'm not a user of auto* tools, but I guess it's done with:
- AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_HEADERS(ws_config.h)

--gv

Just to tidy up any loose ends.  Gerrit change 3787 fixed CMake so that the CMake generated config.h was similar to that produced by nmake so that including either file gets the same results, i.e. the buildbots are now happy.

Longer term we should fix the erroneous inclusion of the in-tree version, I suspect this means converting all #includes of config.h from files in the same directory to the angle bracket form.  This can probably be checked by temporarily introducing a deliberate error in the in-tree one and then running an out-of-tree build.

While there is some merit in giving config.h a Wireshark specific name to prevent conflicts form other packages, e.g. ws_config.h, as we haven't seen any issues with that, I'll leave that as an exercise for others.

--

Graham Bloice