Merge from emacs-24; up to 2012-11-23T06:23:28Z!cyd@gnu.org

[bpt/emacs.git] / INSTALL.BZR

diff --git a/INSTALL.BZR b/INSTALL.BZR
index 93e53fd..9ff6a73 100644 (file)
--- a/INSTALL.BZR
+++ b/INSTALL.BZR
@@ -8,8 +8,9 @@ Building Emacs from Bazaar requires some tools that are not needed
 when building from a release.  You will need:
 
 autoconf  - at least the version specified near the start of
 when building from a release.  You will need:
 
 autoconf  - at least the version specified near the start of

-  configure.in (in the AC_PREREQ command).
-automake  - we recommend at least version 1.11.
+  configure.ac (in the AC_PREREQ command).
+automake  - at least the version specified near the start of
+  configure.ac (in the AM_INIT_AUTOMAKE command).

 makeinfo  - not strictly necessary, but highly recommended, so that
   you can build the manuals.
 
 makeinfo  - not strictly necessary, but highly recommended, so that
   you can build the manuals.
 


@@ -30,7 +31,7 @@ options you can set):
 
 If you want later builds to go faster, at the expense of sometimes
 doing the wrong thing if you update the build procedure, you can
 
 If you want later builds to go faster, at the expense of sometimes
 doing the wrong thing if you update the build procedure, you can

-invoke "./configure -C --disable-maintainer-mode" instead.
+invoke "./configure -C" instead.

 
 Some of the files that are included in the Emacs tarball, such as
 byte-compiled Lisp files, are not stored in Bazaar.  Therefore, to
 
 Some of the files that are included in the Emacs tarball, such as
 byte-compiled Lisp files, are not stored in Bazaar.  Therefore, to