Build/doc fixes

[Simon Josefsson]

Hi!  I tried to build inetutils on a new system, and made some small
improvements -- I have pushed the patches below.

/Simon

From e1f3bd95d80e30c233ad0e88eb69e5170b298ae6 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
Date: Sun, 24 Jan 2021 14:23:43 +0100
Subject: [PATCH 1/2] bootstrap: Updated from gnulib.

---
 ChangeLog |  4 ++++
 bootstrap | 13 ++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9200e75c..3035ce6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2021-01-24  Simon Josefsson  <simon@josefsson.org>
+
+       * bootstrap: Updated from gnulib.
+
 2020-11-10  Mats Erik Andersson  <gnu@gisladisker.se>
 
        * configure.ac (AC_PREREQ): Require autoconf 2.64, caused
diff --git a/bootstrap b/bootstrap
index 7523f65b..c17a36f1 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2020-11-18.17; # UTC
+scriptversion=2021-01-10.00; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -47,7 +47,7 @@ PERL="${PERL-perl}"
 
 me=$0
 
-default_gnulib_url=git://git.sv.gnu.org/gnulib
+default_gnulib_url=https://git.savannah.gnu.org/git/gnulib.git
 
 usage() {
   cat <<EOF
@@ -184,7 +184,7 @@ po_download_command_format=\
  https://translationproject.org/latest/%s/";
 
 # Prefer a non-empty tarname (4th argument of AC_INIT if given), else
-# fall back to the package name (1st argument with munging)
+# fall back to the package name (1st argument with munging).
 extract_package_name='
   /^AC_INIT(\[*/{
      s///
@@ -201,8 +201,11 @@ extract_package_name='
      p
   }
 '
-package=$(sed -n "$extract_package_name" configure.ac) \
-  || die 'cannot find package name in configure.ac'
+package=$(${AUTOCONF:-autoconf} --trace AC_INIT:\$4 configure.ac 2>/dev/null)
+if test -z "$package"; then
+  package=$(sed -n "$extract_package_name" configure.ac) \
+      || die 'cannot find package name in configure.ac'
+fi
 gnulib_name=lib$package
 
 build_aux=build-aux
-- 
2.20.1

From bb9c696250019a90d0e914c70990dbd75968f7eb Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
Date: Sun, 24 Jan 2021 14:28:04 +0100
Subject: [PATCH 2/2] Build/doc fixes.

* README-alpha (Checking Out the Sources): Use git URL mentioned
on Savannah page.
(Prerequisites): Add bash, gcc, ncurses.
---
 ChangeLog    |  5 +++++
 README-alpha | 19 +++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3035ce6d..e09c5010 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2021-01-24  Simon Josefsson  <simon@josefsson.org>
 
+       Build/doc fixes.
+
+       * README-alpha (Checking Out the Sources): Use git URL mentioned
+       on Savannah page.
+       (Prerequisites): Add bash, gcc, ncurses.
        * bootstrap: Updated from gnulib.
 
 2020-11-10  Mats Erik Andersson  <gnu@gisladisker.se>
diff --git a/README-alpha b/README-alpha
index 02eb9907..cf21af68 100644
--- a/README-alpha
+++ b/README-alpha
@@ -40,7 +40,7 @@ the version control repository.
 To download the source tree from the repository, issue the following
 command:
 
-  git clone git://git.savannah.gnu.org/inetutils.git
+  git clone https://git.savannah.gnu.org/git/inetutils.git
 
 This will give you read-only access.  If you think you need write
 access, contact the mailing list.
@@ -51,13 +51,16 @@ You need the following packages, we don't make any extra 
effort to
 accommodate older versions of these packages, so please make sure that
 you have the latest stable version.
 
-- Autoconf <http://www.gnu.org/software/autoconf/>
-- Automake <http://www.gnu.org/software/automake/>
-- Bison <http://www.gnu.org/software/bison/>
-- Gnulib <http://www.gnu.org/software/gnulib/>
-- M4 <http://www.gnu.org/software/m4/>
-- Texinfo <http://www.gnu.org/software/texinfo>
-- help2man <http://www.gnu.org/software/help2man>
+- shell <https://www.gnu.org/software/bash/>
+- C compiler <https://www.gnu.org/software/gcc/>
+- Autoconf <https://www.gnu.org/software/autoconf/>
+- Automake <https://www.gnu.org/software/automake/>
+- Bison <https://www.gnu.org/software/bison/>
+- Gnulib <https://www.gnu.org/software/gnulib/>
+- M4 <https://www.gnu.org/software/m4/>
+- Texinfo <https://www.gnu.org/software/texinfo>
+- help2man <https://www.gnu.org/software/help2man>
+- ncurses <https://www.gnu.org/software/ncurses/> (optional, for talk)
 
 * Building
 
-- 
2.20.1

signature.asc
Description: PGP signature