Merge branch 'feature/upstream' into develop

1 files changed, 15 insertions, 4 deletions

diff --git a/autogen.sh b/autogen.sh
index 75b3c9c2..3e89ebe4 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,13 +5,10 @@
 # with new versions of autoconf or automake.
 #
 # This script requires autoconf-2.65..2.71 and automake-1.16.4 in the PATH.
-# If not used from a released tarball, it also requires either
-#   - the GNULIB_SRCDIR environment variable pointing to a gnulib checkout, or
-#   - a preceding invocation of './gitsub.sh pull'.
 # It also requires
 #   - the gperf program.
 
-# Copyright (C) 2003-2021 Free Software Foundation, Inc.
+# Copyright (C) 2003-2022 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,7 +23,19 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+# Prerequisite (if not used from a released tarball): either
+#   - the GNULIB_SRCDIR environment variable pointing to a gnulib checkout, or
+#   - a preceding invocation of './autopull.sh'.
+#
 # Usage: ./autogen.sh [--skip-gnulib]
+#
+# Options:
+#   --skip-gnulib       Avoid fetching files from Gnulib.
+#                       This option is useful
+#                       - when you are working from a released tarball (possibly
+#                         with modifications), or
+#                       - as a speedup, if the set of gnulib modules did not
+#                         change since the last time you ran this script.
 
 skip_gnulib=false
 while :; do
@@ -474,3 +483,5 @@ automake --add-missing --copy
 patch build-aux/test-driver < build-aux/test-driver.diff
 # Get rid of autom4te.cache directory.
 rm -rf autom4te.cache
+
+echo "$0: done.  Now you can run './configure'."