From ee604e33653537db8825e76bcc8560dd8cb53910 Mon Sep 17 00:00:00 2001
From: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date: Fri, 7 Jun 2019 20:48:40 +0900
Subject: [PATCH] Update autotools related information.  Re !72

---
 README                  | 15 +++++++++++++++
 doc/backend-writing.txt |  3 +--
 doc/releases.txt        |  5 ++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/README b/README
index 76fe70989..5b08ad197 100644
--- a/README
+++ b/README
@@ -22,6 +22,7 @@ http://www.sane-project.org/sane-frontends.html.
 Quick install:
 ==============
 
+./autogen.sh    # only if you just cloned the git repository
 ./configure
 make
 make install
@@ -56,6 +57,20 @@ installed.
 
         - libgphoto2 (>=2.0): For the gphoto2 backend.
 
+If you got the source straight from the git repository, as opposed to
+a source tarball, you will need a few more utilities.  These utilities
+should normally *not* be needed for source archives downloaded from
+the project's website at http://www.sane-project.org/.
+
+        - autoconf (>= 2.69) as well as the autoconf-archive (for the
+          AX_CXX_COMPILE_STDCXX and AX_CXX_COMPILE_STDCXX_11 macros)
+
+        - automake (>=1.15)
+
+        - libtool (>=2.4.6)
+
+        - gettext (>=0.19.8)
+
 SANE should build on most Unix-like systems. Support for OS/2, MacOS X, BeOS,
 and Microsoft Windows is also available. For more details look at the
 operating system specific README.* files. For a detailed support matrix, see:
diff --git a/doc/backend-writing.txt b/doc/backend-writing.txt
index 1d2092a83..aea00d1a2 100644
--- a/doc/backend-writing.txt
+++ b/doc/backend-writing.txt
@@ -49,8 +49,7 @@ for more complex stuff acinclude.m4 is the right file. After changes in one
 of these files, "autoreconf" should be called.  This will then call a
 chain of autotools, such as autoconf to generate configure, autoheader
 to generate include/sane/config.h.in, and automake to generate various
-Makefile.in's from Makefile.am's.  All changes made by "autoreconf" must
-be commited together.
+Makefile.in's from Makefile.am's.
 
 When running configure, the Makefiles in the main and sub-directories are
 created from their respective Makefile.in files. Also include/sane/config.h
diff --git a/doc/releases.txt b/doc/releases.txt
index dc45ccf88..08bccb06a 100644
--- a/doc/releases.txt
+++ b/doc/releases.txt
@@ -20,14 +20,13 @@ Before the release:
   ls | while read aa; do git log --follow --diff-filter=A --find-renames=40% --format="%ai  $aa" "$aa"; done > foo.log
 
   Then inspect foo.log for any files added since the last release.
+* configure.ac: remove 'git' from textual version number, and increment it
+* run ./autogen.sh
 * Make sure that upstream files are up-to-date by running:
 
   ./tools/update-upstream.sh
 
   Requires curl or wget.
-* configure.ac: remove 'git' from textual version number, and increment it
-* run autoreconf --force but do *NOT* use the --install option as it will
-  overwrite our custom ltmain.sh
 * ChangeLog: generate from git log, something like:
   git log RELEASE_1_0_25..HEAD > ChangeLog
 * NEWS: update and enter date of release, etc