1.1 --- a/README-builds.html Thu Aug 29 15:47:55 2013 +0200
1.2 +++ b/README-builds.html Fri Aug 30 10:13:25 2013 +0200
1.3 @@ -1210,19 +1210,18 @@
1.4 <blockquote>
1.5
1.6 <p>
1.7 - <b>Q:</b> The <code>configure</code> file looks horrible!
1.8 + <b>Q:</b> The <code>generated-configure.sh</code> file looks horrible!
1.9 How are you going to edit it?
1.10 <br>
1.11 - <b>A:</b> The <code>configure</code> file is generated (think
1.12 + <b>A:</b> The <code>generated-configure.sh</code> file is generated (think
1.13 "compiled") by the autoconf tools. The source code is
1.14 - in <code>configure.ac</code> various .m4 files in common/autoconf,
1.15 - which are
1.16 - much more readable.
1.17 + in <code>configure.ac</code> and various .m4 files in common/autoconf,
1.18 + which are much more readable.
1.19 </p>
1.20
1.21 <p>
1.22 <b>Q:</b>
1.23 - Why is the <code>configure</code> file checked in,
1.24 + Why is the <code>generated-configure.sh</code> file checked in,
1.25 if it is generated?
1.26 <br>
1.27 <b>A:</b>
1.28 @@ -1237,13 +1236,29 @@
1.29 <p>
1.30 <b>Q:</b>
1.31 Do you require a specific version of autoconf for regenerating
1.32 - <code>configure</code>?
1.33 + <code>generated-configure.sh</code>?
1.34 <br>
1.35 <b>A:</b>
1.36 - Currently, no, but this will likely be the case when things have
1.37 - settled down a bit more. (The reason for this is to avoid
1.38 - large spurious changes in <code>configure</code>
1.39 - in commits that made small changes to <code>configure.ac</code>).
1.40 + Yes, version 2.69 is required and should be easy
1.41 + enough to aquire on all supported operating
1.42 + systems. The reason for this is to avoid
1.43 + large spurious changes in <code>generated-configure.sh</code>.
1.44 + </p>
1.45 +
1.46 + <p>
1.47 + <b>Q:</b>
1.48 + How do you regenerate <code>generated-configure.sh</code>
1.49 + after making changes to the input files?
1.50 + <br>
1.51 + <b>A:</b>
1.52 + Regnerating <code>generated-configure.sh</code>
1.53 + should always be done using the
1.54 + script <code>common/autoconf/autogen.sh</code> to
1.55 + ensure that the correct files get updated. This
1.56 + script should also be run after mercurial tries to
1.57 + merge <code>generated-configure.sh</code> as a
1.58 + merge of the generated file is not guaranteed to
1.59 + be correct.
1.60 </p>
1.61
1.62 <p>
