Split autogen.sh into autopull.sh and autogen.sh.

* autopull.sh: New file, based on autogen.sh.
* autogen.sh: Remove code that was moved to autopull.sh.
* Makefile.in (SOURCE_FILES): Add autogen.sh.

4 files changed, 51 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index 8ee80b4..12498a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-07-17  Bruno Haible  <bruno@clisp.org>
+
+	Split autogen.sh into autopull.sh and autogen.sh.
+	* autopull.sh: New file, based on autogen.sh.
+	* autogen.sh: Remove code that was moved to autopull.sh.
+	* Makefile.in (SOURCE_FILES): Add autogen.sh.
+
 2022-07-05  Bruno Haible  <bruno@clisp.org>
 
 	Add support for reproducible builds.
diff --git a/Makefile.in b/Makefile.in
index 8090db8..babf2fc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -61,7 +61,7 @@ maintainer-clean : force
 # List of source files.
 SOURCE_FILES = \
   README INSTALL.windows NEWS AUTHORS JOIN-GNU \
-  configure.ac aclocal.m4 Makefile.in \
+  autogen.sh configure.ac aclocal.m4 Makefile.in \
   Makefile.devel ChangeLog
 # List of distributed files imported from other packages.
 IMPORTED_FILES = \
diff --git a/autogen.sh b/autogen.sh
index 708767d..3cd1367 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,10 +5,6 @@
 # autoconf.
 #
 # This script requires autoconf-2.64..2.71 in the PATH.
-# It also requires either
-#   - the GNULIB_TOOL environment variable pointing to the gnulib-tool script
-#     in a gnulib checkout, or
-#   - an internet connection.
 
 # Copyright (C) 2003-2022 Free Software Foundation, Inc.
 #
@@ -25,23 +21,9 @@
 # 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): ./autopull.sh
 # Usage: ./autogen.sh
 
-GNULIB_REPO_URL="https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f="
-
-for file in build-aux/install-sh build-aux/mkinstalldirs \
-            build-aux/compile build-aux/ar-lib \
-            lib/filename.h; do
-  if test -n "$GNULIB_TOOL"; then
-    $GNULIB_TOOL --copy-file $file $file
-  else
-    wget -q --timeout=5 -O $file.tmp "${GNULIB_REPO_URL}$file" \
-      && mv $file.tmp $file
-  fi
-done
-chmod a+x build-aux/install-sh build-aux/mkinstalldirs \
-          build-aux/compile build-aux/ar-lib
-
 make -f Makefile.devel totally-clean all || exit $?
 
 echo "$0: done.  Now you can run './configure'."
diff --git a/autopull.sh b/autopull.sh
new file mode 100755
index 0000000..ccaef8b
--- /dev/null
+++ b/autopull.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+# Convenience script for fetching auxiliary files that are omitted from
+# the version control repository of this package.
+#
+# This script requires either
+#   - the GNULIB_TOOL environment variable pointing to the gnulib-tool script
+#     in a gnulib checkout, or
+#   - an internet connection.
+
+# 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
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# Usage: ./autopull.sh
+
+GNULIB_REPO_URL="https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f="
+
+for file in build-aux/install-sh build-aux/mkinstalldirs \
+            build-aux/compile build-aux/ar-lib \
+            lib/filename.h; do
+  if test -n "$GNULIB_TOOL"; then
+    $GNULIB_TOOL --copy-file $file $file
+  else
+    wget -q --timeout=5 -O $file.tmp "${GNULIB_REPO_URL}$file" \
+      && mv $file.tmp $file
+  fi
+done
+chmod a+x build-aux/install-sh build-aux/mkinstalldirs \
+          build-aux/compile build-aux/ar-lib
+
+echo "$0: done.  Now you can run './autogen.sh'."