diff -r 51009a053562 -r 9dac5000c015 README-builds.html --- a/README-builds.html Thu Aug 29 15:47:55 2013 +0200 +++ b/README-builds.html Fri Aug 30 10:13:25 2013 +0200 @@ -1210,19 +1210,18 @@
- Q: The
configure
file looks horrible! + Q: Thegenerated-configure.sh
file looks horrible! How are you going to edit it?
- A: Theconfigure
file is generated (think + A: Thegenerated-configure.sh
file is generated (think "compiled") by the autoconf tools. The source code is - inconfigure.ac
various .m4 files in common/autoconf, - which are - much more readable. + inconfigure.ac
and various .m4 files in common/autoconf, + which are much more readable.Q: - Why is the
configure
file checked in, + Why is thegenerated-configure.sh
file checked in, if it is generated?
A: @@ -1237,13 +1236,29 @@Q: Do you require a specific version of autoconf for regenerating -
+ +configure
? +generated-configure.sh
?
A: - Currently, no, but this will likely be the case when things have - settled down a bit more. (The reason for this is to avoid - large spurious changes inconfigure
- in commits that made small changes toconfigure.ac
). + Yes, version 2.69 is required and should be easy + enough to aquire on all supported operating + systems. The reason for this is to avoid + large spurious changes ingenerated-configure.sh
. ++ Q: + How do you regenerate
generated-configure.sh
+ after making changes to the input files? +
+ A: + Regneratinggenerated-configure.sh
+ should always be done using the + scriptcommon/autoconf/autogen.sh
to + ensure that the correct files get updated. This + script should also be run after mercurial tries to + mergegenerated-configure.sh
as a + merge of the generated file is not guaranteed to + be correct.