unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / Atom feed
* [bug#46564] [PATCH core-updates]: Use autoconf-wrapper instead of autoconf
@ 2021-02-16 18:10 Maxime Devos
  2021-02-21 22:05 ` Ludovic Courtès
  0 siblings, 1 reply; 5+ messages in thread
From: Maxime Devos @ 2021-02-16 18:10 UTC (permalink / raw)
  To: 46564


[-- Attachment #1.1: Type: text/plain, Size: 1471 bytes --]

Hi Guix,

This patch replaces autoconf with autoconf-wrapped in the native-inputs
almost everywhere (except for some packages in
gnu/packages/autotools.scm).  As this would cause many rebuilds, this
patch targets the "core-updates" branch and not "master".

A wine package has autoconf in the inputs instead of native-inputs,
I wonder if that's intentional or a bug?  I left that package untouched
for now.

Why this change?

* consistency / reducing confusion: some packages use autoconf, some use
  autoconf-wrapper, and there's no (to me) obvious reason why two variants
  of autoconf should be used.

* <whatever pro's nckx had in mind on #guix>

* some progress towards booting without /bin/sh

  Scenario I have in mind (untested):

  1. boot a system that doesn't have /bin/sh
  2. decide to hack on guix (run git clone ...., cd $REPO)
  3. guix environment guix
  4. sh ./bootstrap (calls autoreconf -vfi)
  5. ./configure --localstatedir=/var
  6. more stuff

  Without this patch, step (5.) will fail without this patch because
  the generated ./configure script refers to /bin/sh, which doesn't
  exist.

  That said, there are some #!/bin/sh shebangs in the source code,
  so there are some problems in (6.).

Why not?

* ‘make dist’ will produce unusable tarballs
  when in an environment from ‘guix environment PACKAGE’.
  This should now be replaced with ‘guix environment PACKAGE --ad-hoc
  autoconf'.

[-- Attachment #1.2: 0001-Use-autoconf-wrapper-instead-of-autoconf.patch --]
[-- Type: text/x-patch, Size: 180624 bytes --]

From ccaafef22d4c812b37e0b70ed9c0879db0bb6cfa Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Tue, 16 Feb 2021 13:14:47 +0100
Subject: [PATCH] Use autoconf-wrapper instead of autoconf

This avoids creating configuring scripts
with a #!/bin/sh shebang during the bootstrap
phase, which doesn't make much sense.
---
 gnu/packages/admin.scm              |  8 ++--
 gnu/packages/aidc.scm               |  2 +-
 gnu/packages/algebra.scm            | 18 ++++----
 gnu/packages/animation.scm          |  2 +-
 gnu/packages/antivirus.scm          |  2 +-
 gnu/packages/arcan.scm              |  2 +-
 gnu/packages/assembly.scm           |  2 +-
 gnu/packages/astronomy.scm          |  4 +-
 gnu/packages/audio.scm              | 28 ++++++------
 gnu/packages/authentication.scm     |  2 +-
 gnu/packages/backup.scm             |  6 +--
 gnu/packages/bioinformatics.scm     | 12 ++---
 gnu/packages/c.scm                  |  8 ++--
 gnu/packages/cdrom.scm              |  2 +-
 gnu/packages/check.scm              |  2 +-
 gnu/packages/ci.scm                 |  2 +-
 gnu/packages/cinnamon.scm           |  2 +-
 gnu/packages/cluster.scm            |  2 +-
 gnu/packages/code.scm               |  2 +-
 gnu/packages/compression.scm        |  8 ++--
 gnu/packages/coq.scm                |  8 ++--
 gnu/packages/cpp.scm                |  4 +-
 gnu/packages/cran.scm               |  2 +-
 gnu/packages/crypto.scm             |  8 ++--
 gnu/packages/cups.scm               |  2 +-
 gnu/packages/cyrus-sasl.scm         |  2 +-
 gnu/packages/databases.scm          |  8 ++--
 gnu/packages/datastructures.scm     |  2 +-
 gnu/packages/debian.scm             |  6 +--
 gnu/packages/debug.scm              |  4 +-
 gnu/packages/dictionaries.scm       |  2 +-
 gnu/packages/disk.scm               |  4 +-
 gnu/packages/distributed.scm        |  2 +-
 gnu/packages/djvu.scm               |  4 +-
 gnu/packages/dns.scm                | 10 ++---
 gnu/packages/documentation.scm      |  4 +-
 gnu/packages/efi.scm                |  2 +-
 gnu/packages/emacs-xyz.scm          | 14 +++---
 gnu/packages/emacs.scm              |  4 +-
 gnu/packages/embedded.scm           |  6 +--
 gnu/packages/emulators.scm          | 10 ++---
 gnu/packages/engineering.scm        | 14 +++---
 gnu/packages/erlang.scm             |  2 +-
 gnu/packages/fabric-management.scm  |  6 +--
 gnu/packages/file-systems.scm       |  8 ++--
 gnu/packages/finance.scm            |  6 +--
 gnu/packages/fontutils.scm          |  2 +-
 gnu/packages/fpga.scm               |  4 +-
 gnu/packages/freedesktop.scm        | 12 ++---
 gnu/packages/ftp.scm                |  2 +-
 gnu/packages/game-development.scm   |  4 +-
 gnu/packages/games.scm              | 16 +++----
 gnu/packages/genimage.scm           |  2 +-
 gnu/packages/geo.scm                |  8 ++--
 gnu/packages/gimp.scm               |  4 +-
 gnu/packages/gl.scm                 |  4 +-
 gnu/packages/gnome-xyz.scm          |  6 +--
 gnu/packages/gnome.scm              | 24 +++++-----
 gnu/packages/gnupg.scm              |  6 +--
 gnu/packages/gnustep.scm            |  2 +-
 gnu/packages/gnuzilla.scm           |  2 +-
 gnu/packages/graph.scm              |  2 +-
 gnu/packages/graphics.scm           | 10 ++---
 gnu/packages/graphviz.scm           |  2 +-
 gnu/packages/gstreamer.scm          |  2 +-
 gnu/packages/gtk.scm                |  8 ++--
 gnu/packages/guile-xyz.scm          | 70 ++++++++++++++---------------
 gnu/packages/guile.scm              | 12 ++---
 gnu/packages/hardware.scm           |  6 +--
 gnu/packages/hexedit.scm            |  2 +-
 gnu/packages/hurd.scm               |  8 ++--
 gnu/packages/image-viewers.scm      |  2 +-
 gnu/packages/image.scm              |  8 ++--
 gnu/packages/jami.scm               |  2 +-
 gnu/packages/java.scm               | 12 ++---
 gnu/packages/kodi.scm               |  8 ++--
 gnu/packages/language.scm           |  8 ++--
 gnu/packages/libreoffice.scm        |  2 +-
 gnu/packages/libusb.scm             |  4 +-
 gnu/packages/lighting.scm           |  2 +-
 gnu/packages/linux.scm              | 26 +++++------
 gnu/packages/lxde.scm               |  2 +-
 gnu/packages/machine-learning.scm   |  2 +-
 gnu/packages/mail.scm               | 14 +++---
 gnu/packages/mate.scm               |  2 +-
 gnu/packages/maths.scm              |  8 ++--
 gnu/packages/mercury.scm            |  2 +-
 gnu/packages/messaging.scm          | 22 ++++-----
 gnu/packages/microcom.scm           |  2 +-
 gnu/packages/monitoring.scm         |  4 +-
 gnu/packages/mpd.scm                |  2 +-
 gnu/packages/music.scm              |  4 +-
 gnu/packages/networking.scm         | 14 +++---
 gnu/packages/nfs.scm                |  2 +-
 gnu/packages/ntp.scm                |  2 +-
 gnu/packages/ocaml.scm              |  4 +-
 gnu/packages/onc-rpc.scm            |  2 +-
 gnu/packages/openldap.scm           |  2 +-
 gnu/packages/package-management.scm |  8 ++--
 gnu/packages/parallel.scm           |  2 +-
 gnu/packages/pdf.scm                |  4 +-
 gnu/packages/plotutils.scm          |  2 +-
 gnu/packages/poedit.scm             |  2 +-
 gnu/packages/profiling.scm          |  2 +-
 gnu/packages/pulseaudio.scm         |  2 +-
 gnu/packages/radio.scm              |  8 ++--
 gnu/packages/rdf.scm                |  4 +-
 gnu/packages/rpc.scm                |  2 +-
 gnu/packages/ruby.scm               |  2 +-
 gnu/packages/sagemath.scm           |  8 ++--
 gnu/packages/samba.scm              |  2 +-
 gnu/packages/sawfish.scm            |  2 +-
 gnu/packages/scheme.scm             |  2 +-
 gnu/packages/sdl.scm                |  2 +-
 gnu/packages/security-token.scm     |  6 +--
 gnu/packages/shells.scm             |  8 ++--
 gnu/packages/shellutils.scm         |  2 +-
 gnu/packages/smalltalk.scm          |  2 +-
 gnu/packages/speech.scm             |  4 +-
 gnu/packages/ssh.scm                |  4 +-
 gnu/packages/statistics.scm         |  2 +-
 gnu/packages/sync.scm               |  2 +-
 gnu/packages/syndication.scm        |  2 +-
 gnu/packages/telegram.scm           |  6 +--
 gnu/packages/telephony.scm          |  6 +--
 gnu/packages/terminals.scm          |  6 +--
 gnu/packages/texinfo.scm            |  2 +-
 gnu/packages/text-editors.scm       |  2 +-
 gnu/packages/textutils.scm          |  6 +--
 gnu/packages/tor.scm                |  2 +-
 gnu/packages/upnp.scm               |  2 +-
 gnu/packages/version-control.scm    |  2 +-
 gnu/packages/video.scm              | 26 +++++------
 gnu/packages/virtualization.scm     |  6 +--
 gnu/packages/vnc.scm                |  4 +-
 gnu/packages/vpn.scm                |  4 +-
 gnu/packages/vulkan.scm             |  2 +-
 gnu/packages/web.scm                | 20 ++++-----
 gnu/packages/wm.scm                 |  6 +--
 gnu/packages/xdisorg.scm            | 14 +++---
 gnu/packages/xiph.scm               |  2 +-
 gnu/packages/xml.scm                |  4 +-
 gnu/packages/xorg.scm               | 10 ++---
 143 files changed, 431 insertions(+), 431 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 4566b5925c..36c67e9996 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -166,7 +166,7 @@
                 "supath=/run/setuid-programs/su"))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -544,7 +544,7 @@ or via the @code{facter} Ruby library.")
     (inputs
      `(("ncurses" ,ncurses)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("python" ,python-minimal-wrapper)))     ; for scripts/MakeHeader.py
     (home-page "https://htop.dev")
@@ -1997,7 +1997,7 @@ system is under heavy load.")
                 "13mhs62m7bpff45liy65pajq5jg3i12jj90vwdkra94z9mlr2rlz"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("flex" ,flex)))
     (arguments
@@ -3490,7 +3490,7 @@ make it a perfect utility on modern distros.")
                (("-Werror") ""))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("autoconf-archive" ,autoconf-archive)
        ("automake" ,automake)
        ("glib" ,glib "bin")             ; for glib-genmarshal, etc.
diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm
index 6628a8ead3..a6ae96eeca 100644
--- a/gnu/packages/aidc.scm
+++ b/gnu/packages/aidc.scm
@@ -146,7 +146,7 @@ characters, and is highly robust.")
      ;; XXX Test suite is broken: https://github.com/dmtx/libdmtx/issues/22
      `(#:tests? #f))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 546b058e71..8f4eab114f 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -165,7 +165,7 @@ line applications.")
               (patches (search-patches "fplll-std-fenv.patch"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -713,7 +713,7 @@ binary.")
     (build-system gnu-build-system)
     (native-inputs
      `(("automake" ,automake)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("ed" ,ed)
        ("flex" ,flex)
        ("texinfo" ,texinfo)))
@@ -1277,7 +1277,7 @@ objects.")
                 "11wz57q6ijsvfs5r82masxgr319as92syi78lnl9lgdblpc6xigk"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (propagated-inputs
@@ -1308,7 +1308,7 @@ compound objects, such as vectors, matrices and univariate polynomials.")
                 "1ynbjd72qrwp0b4kpn0p5d7gddpvj8dlb5fwdxajr5pvkvi3if74"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -1351,7 +1351,7 @@ algebra, such as the row echelon form.")
               (patches (search-patches "linbox-fix-pkgconfig.patch"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -1380,7 +1380,7 @@ finite fields.")
                 "0xfg6pffbn8r1s0y7bn9b8i55l00d41dkmhrpf7pwk53qa3achd3"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -1470,7 +1470,7 @@ polynomials, and the representation theory of Hecke algebras of type A_n.")
                 "0r8lv46qx5mkz5kp3ay2jnsp0mbhlqr5z2z220wdk73wdshcznss"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (inputs
@@ -1497,7 +1497,7 @@ of M4RI from F_2 to F_{2^e}.")
                 "1gw27lqc3f525n8qdcmr2nyn16y9g10z9f6dnmckyyxcdzvhq35n"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (inputs
@@ -1527,7 +1527,7 @@ John Cremona to compute his elliptic curve database.")
               (patches (search-patches "lrcalc-includes.patch"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (arguments
diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm
index c92c4ae7e7..e74bd4ab49 100644
--- a/gnu/packages/animation.scm
+++ b/gnu/packages/animation.scm
@@ -285,7 +285,7 @@ contains the graphical user interface for synfig.")
                               (assoc-ref %build-inputs "libpng")
                               "/include"))))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("dejagnu" ,dejagnu) ;for tests
          ("gettext" ,gettext-minimal)
diff --git a/gnu/packages/antivirus.scm b/gnu/packages/antivirus.scm
index 29763f3452..91ef7ecc97 100644
--- a/gnu/packages/antivirus.scm
+++ b/gnu/packages/antivirus.scm
@@ -66,7 +66,7 @@
                                "clamav-config-llvm-libs.patch"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("check" ,check)                 ; for tests
        ("libtool" ,libtool)
diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm
index a84bf0d8dd..8bd6db3071 100644
--- a/gnu/packages/arcan.scm
+++ b/gnu/packages/arcan.scm
@@ -219,7 +219,7 @@ engine programmable using Lua.")
                            "/tmp"))))   ; FIXME: Copied from xorg
       (native-inputs
        `(("pkg-config" ,pkg-config)
-         ("autoconf" ,autoconf)
+         ("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("libtool" ,libtool)
          ("util-macros" ,util-macros)))
diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm
index 307d261b82..c298d90139 100644
--- a/gnu/packages/assembly.scm
+++ b/gnu/packages/assembly.scm
@@ -275,7 +275,7 @@ assembler, a C compiler and a linker.  The assembler uses Intel syntax
                   "0p6wklslkkp3s4aisj3w5a53bagqn5fy4m6088ppd4fcfxgqkrcd"))))
       (build-system gnu-build-system)
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("bison" ,bison)
          ("flex" ,flex)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 07dee4b462..fefbe68a7d 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -238,7 +238,7 @@ programs for the manipulation and analysis of astronomical data.")
         (string-append
          "--with-fftw-incdir=" (assoc-ref %build-inputs "fftw") "/include"))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (inputs
@@ -456,7 +456,7 @@ accurately in real time at any rate desired.")
                (("/bin/sh") (which "sh")))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (synopsis "Celestial mechanics, astrometry and astrodynamics library")
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 565346db00..04a04076f7 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -389,7 +389,7 @@ by MusicIP.")
         (base32 "1lmj0dib3mjp84jhxc5ddvydkzzhb0gfrdh3ikcidjlcb378ghxd"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -736,7 +736,7 @@ engineers, musicians, soundtrack editors and composers.")
        ("suil" ,suil)                   ;for lv2
        ("portmidi" ,portmidi)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)     ;for msgfmt
        ("libtool" ,libtool)
@@ -1058,7 +1058,7 @@ envelope follower, distortion effects, tape effects and more.")
                (base32
                 "1c98z2xxz9pgcb4dg99gz8qrylh5cnag0j18a52d88ifsy24isvq"))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal) ;for autopoint
        ("libtool" ,libtool)
@@ -2619,7 +2619,7 @@ and ALSA.")
     (arguments
      `(#:configure-flags '("--disable-static")))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)
@@ -2877,7 +2877,7 @@ aimed at audio/musical applications.")
                        "074zj8ydp05yy1hjcglfv3hkvj4cm50f9nralka1992pm6yf8yvy"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)
        ("libtool" ,libtool)))
@@ -2946,7 +2946,7 @@ tempo and pitch of an audio recording independently of one another.")
      `(("jack" ,jack-1)
        ("alsa-lib" ,alsa-lib)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -3208,7 +3208,7 @@ stretching and pitch scaling of audio.  This package contains the library.")
              (invoke "autoreconf" "-vif")
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (home-page "http://www.wavpack.com/")
@@ -3301,7 +3301,7 @@ Tracker 3 S3M and Impulse Tracker IT files.")
         (base32 "12i6yg8vvqwyk412lxl2krbfby6hnxld8qxy0k4m5xp4g94jiq4p"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("file" ,file)))
@@ -3424,7 +3424,7 @@ portions of LAME.")
     ;; Autoreconf is necessary because the audacity-compat patch modifies .in
     ;; files.
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -3734,7 +3734,7 @@ point audio data.")
     (build-system gnu-build-system)
     ;; The source checkout is not bootstrapped.
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("flex" ,flex)
        ("bison" ,bison)))
@@ -4003,7 +4003,7 @@ kbps at 24 bit/96 kHz.")
                             (assoc-ref %outputs "out")
                             "/etc/dbus-1/system.d"))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -4180,7 +4180,7 @@ the following features:
       (inputs
        `(("lv2" ,lv2)))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("libtool" ,libtool)
          ("pkg-config" ,pkg-config)))
@@ -4252,7 +4252,7 @@ representations.")
                 "04j5hb29hivcbk542sfsx9m57dbnj2s6qpvy9fs488zvgjbgxrai"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (inputs
@@ -4339,7 +4339,7 @@ using ALSA, MPD, PulseAudio, or a FIFO buffer as its input.")
           "1fkrnzs78fmj11n9z3l0w53i2fl16jcfiyavwidck9bzmkmsf486"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (home-page "https://github.com/mstorsjo/fdk-aac")
diff --git a/gnu/packages/authentication.scm b/gnu/packages/authentication.scm
index bd40a6eb5c..635efe88d9 100644
--- a/gnu/packages/authentication.scm
+++ b/gnu/packages/authentication.scm
@@ -105,7 +105,7 @@ and the time-based @dfn{TOTP} algorithm (RFC6238).")
          ("ykclient" ,ykclient)
          ("yubikey-personalization" ,yubikey-personalization)))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("libtool" ,libtool)
          ("asciidoc" ,asciidoc)
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index c1e9de5595..e2e338464d 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -161,7 +161,7 @@ spying and/or modification by the server.")
                 "11mx8q29cr0sryd11awab7y4mhqgbamb1ss77rffjj6in8pb4hdk"))))
     (native-inputs
      `(("automake" ,automake)
-       ("autoconf" ,autoconf)))
+       ("autoconf" ,autoconf-wrapper)))
     (build-system gnu-build-system)
     (synopsis "File verification and repair tools")
     (description "Par2cmdline uses Reed-Solomon error-correcting codes to
@@ -324,7 +324,7 @@ random access nor for in-place modification.")
         (base32 "0bzyv6qmnivxnv9nw7lnfn46k0m1dlxcjj53zcva6v8y8084l1iw"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)
 
@@ -1073,7 +1073,7 @@ interactive mode.")
        ("uthash" ,uthash)
        ("zlib" ,zlib)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("check" ,check-0.14)
        ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index bc182fbea3..0fc3f29918 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -247,7 +247,7 @@ structure of the predicted RNA.")
                  `("PATH" ":" prefix (,path))
                  `("GUIX_PYTHONPATH" ":" prefix (,pythonpath)))))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("zlib" ,zlib)
@@ -4843,7 +4843,7 @@ sequences).")
                (("c\\+\\+11") "c++14"))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ;; Capnproto and htslib are statically embedded in the final
        ;; application. Therefore we also list their licenses, below.
        ("capnproto" ,capnproto)
@@ -5098,7 +5098,7 @@ program for nucleotide and protein sequences.")
        ("flex" ,flex)
        ("bison" ,bison)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (synopsis "Programs for working with newick format phylogenetic trees")
@@ -5806,7 +5806,7 @@ distribution, coverage uniformity, strand specificity, etc.")
          ("gengetopt" ,gengetopt)
          ("log4cpp" ,log4cpp)))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("perl" ,perl)))
       (home-page "http://seek.princeton.edu")
@@ -7644,7 +7644,7 @@ annotation infrastructure.")
        ("bzip2" ,bzip2)
        ("cityhash" ,cityhash)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (synopsis "Sequence search tools for metagenomics")
     (description
@@ -9327,7 +9327,7 @@ AM_CONDITIONAL(AMPNG, true)"))
        ("libharu" ,libharu)
        ("zlib" ,zlib)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index d9e5e4d7de..1a2dc4083a 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -235,7 +235,7 @@ Its three main components are:
          "1x4q6yspi5g2s98vq4qszw4z3zjgk9l5zs8471w4d4cs6l97w08j"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)
@@ -433,7 +433,7 @@ releases.")
          (replace 'bootstrap
            (lambda _ (invoke "autoreconf" "-vfi"))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)
        ("libtool" ,libtool)))
@@ -460,7 +460,7 @@ more, like escaping special characters.")
          "0qhs0g9slj3p0v2z4s3cnsx44msrlb4k78ljg7714qiziqbrbwyl"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (home-page "https://github.com/rsyslog/libfastjson")
@@ -493,7 +493,7 @@ with essential JSON handling functions, sufficiently good JSON support (not
          (replace 'bootstrap
            (lambda _ (invoke "autoreconf" "-vfi"))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)
        ("libtool" ,libtool)
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index 22afd01cac..4cde9c3bea 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -280,7 +280,7 @@ reconstruction capability.")
              (substitute* "configure.ac" (("^AM_GCONF_SOURCE_2.*") ""))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (inputs
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 11117b88e4..c05c7dcc50 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -255,7 +255,7 @@ testing of Unix command lines.")
                      (lambda _ (invoke "autoreconf" "-vfi"))))))
     (native-inputs
      `(("automake" ,automake)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("libtool" ,libtool)))
     (home-page "http://cunit.sourceforge.net/")
     (synopsis "Automated testing framework for C")
diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm
index ad2e979fbc..24e38cae0a 100644
--- a/gnu/packages/ci.scm
+++ b/gnu/packages/ci.scm
@@ -130,7 +130,7 @@
          ("guile-bytestructures" ,guile-bytestructures)
          ("guix" ,guix)))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("pkg-config" ,pkg-config)
          ("texinfo" ,texinfo)))
diff --git a/gnu/packages/cinnamon.scm b/gnu/packages/cinnamon.scm
index e1c9d7b614..dc72ffe5db 100644
--- a/gnu/packages/cinnamon.scm
+++ b/gnu/packages/cinnamon.scm
@@ -64,7 +64,7 @@
        ("pulseaudio" ,pulseaudio)
        ("xkeyboard-config" ,xkeyboard-config)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)
        ("glib" ,glib "bin") ; glib-gettextize
diff --git a/gnu/packages/cluster.scm b/gnu/packages/cluster.scm
index 01996591c7..78348846d8 100644
--- a/gnu/packages/cluster.scm
+++ b/gnu/packages/cluster.scm
@@ -207,7 +207,7 @@ independently or together to provide resilient infrastructures.")
     (inputs
      `(("libuv" ,libuv)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)
        ("libtool" ,libtool)
diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index 4e30dacdf4..7d96fa3c1d 100644
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -390,7 +390,7 @@ features that are not supported by the standard @code{stdio} implementation.")
                         (("/bin/echo") (which "echo")))
                       #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ;; XXX: Use ctags' own packcc fork even though we meticolously unbundle
        ;; it above.  Mainly for historical reasons, and perhaps their changes
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 972b227dab..09e411ef8c 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -162,7 +162,7 @@ in compression.")
                (delete-file (string-append out "/include/minizip/crypt.h"))
                #t))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (propagated-inputs `(("zlib" ,zlib)))
@@ -214,7 +214,7 @@ the @code{zlib} source.")
    (build-system gnu-build-system)
    (arguments `(#:tests? #f)) ; no "check" target
    (native-inputs
-    `(("autoconf" ,autoconf)
+    `(("autoconf" ,autoconf-wrapper)
       ("automake" ,automake)
       ("libtool" ,libtool)))
    (inputs
@@ -419,7 +419,7 @@ decompression.")
                (invoke "sh" "build-aux/autogen.sh")
                #t)))))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("gnulib"
           ,(let ((commit "2d431ac35c4943a3655c07ba91870d2323321b43"))
@@ -1090,7 +1090,7 @@ file.")
            #t))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (arguments
      `(#:phases
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index fb6a899b48..fa596d2b28 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -232,7 +232,7 @@ provers.")
          "01gdykva0lcw6y3dm8j0djxayb87szfg9vn0mxd6z3pks644misl"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("ocaml" ,ocaml)
        ("which" ,which)
@@ -289,7 +289,7 @@ inside Coq.")
          "0f3g3wjkvfkm961l4jpckhsqd43jnvm7f5qqk78qc32zh1fg339n"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("ocaml" ,ocaml)
        ("which" ,which)
@@ -391,7 +391,7 @@ part of the distribution.")
          "0mz3pxan1237fr5fi79c66y7b9z7bmi0sc45kwrmkczsjm5462jm"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("ocaml" ,ocaml)
        ("which" ,which)
@@ -477,7 +477,7 @@ provides BigN, BigZ, BigQ that used to be part of Coq standard library.")
          "01iz6qmnsm6b9s1vmdjs79vjx9xgwzn5rwyjp6bvs8hg3zlmhpip"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("ocaml" ,ocaml)
        ("which" ,which)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index ae47490755..f125ff025e 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -148,7 +148,7 @@ use by the C++ Core Guidelines maintained by the Standard C++ Foundation.")
                (base32
                 "1nkygc17sndznpcf71fdrhwpm8z9a3hc9csqlafwswh49axhfkjr"))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (build-system gnu-build-system)
@@ -524,7 +524,7 @@ maintained anymore.")
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ;; For tests.
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 1fe90619cd..09163fe36e 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -17650,7 +17650,7 @@ dataset-specific factors.")
        ("r-tibble" ,r-tibble)
        ("r-tidyr" ,r-tidyr)))
     (native-inputs
-     `(("autoconf" ,autoconf)))
+     `(("autoconf" ,autoconf-wrapper)))
     (home-page "https://github.com/immunogenomics/harmony")
     (synopsis "Integration of single cell sequencing data")
     (description
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index feea22a793..bb32e8027c 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -977,7 +977,7 @@ security.")
                (string-append "--with-openssl="
                               (assoc-ref %build-inputs "openssl")))))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("libtool" ,libtool)))
       (inputs
@@ -1048,7 +1048,7 @@ trivial to build for local use.  Portability is emphasized over performance.")
                              "--enable-module-ecdh"
                              "--enable-shared")))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("libtool" ,libtool)))
       ;; WARNING: This package might need additional configure flags to run properly.
@@ -1088,7 +1088,7 @@ Features:
         (base32 "1rnif3iny6pz1r3g69bagzr342mm3x0v66b60csnmm1rg44bd5v1"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (arguments
@@ -1326,7 +1326,7 @@ SHA-256, SHA-512, and WHIRLPOOL hashes.")
                (install-file "mkp224o" bindir)
                #t))))))
     (native-inputs
-     `(("autoconf" ,autoconf)))
+     `(("autoconf" ,autoconf-wrapper)))
     (inputs
      `(("libsodium" ,libsodium)))
     (synopsis "Tor hidden service v3 name generator")
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 8393fe5fe4..7d72dc2559 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -896,7 +896,7 @@ HP@tie{}LaserJet, and possibly other printers.  See @file{README} for details.")
                  (for-each (cut invoke "gzip" "-9" <>)
                            (find-files "share/cups" "\\.ppd$")))))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (inputs
      `(("cups" ,cups-minimal)))
diff --git a/gnu/packages/cyrus-sasl.scm b/gnu/packages/cyrus-sasl.scm
index 3e65a1faf6..a450afc5ae 100644
--- a/gnu/packages/cyrus-sasl.scm
+++ b/gnu/packages/cyrus-sasl.scm
@@ -47,7 +47,7 @@
             (patches (search-patches "cyrus-sasl-ac-try-run-fix.patch"))))
    (build-system gnu-build-system)
    (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
    (inputs `(("gdbm" ,gdbm)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index ff3890eff8..cd92c6b1d3 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -169,7 +169,7 @@
     (native-inputs
      `(("perl" ,perl)
        ("python" ,python-2)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)
        ("libtool" ,libtool)
@@ -560,7 +560,7 @@ applications.")
     (native-inputs
      `(("memcached" ,memcached)
        ("libtool" ,libtool)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("bison" ,bison)
        ("flex" ,flex)
@@ -2436,7 +2436,7 @@ trees (LSM), for sustained throughput under random insert workloads.")
                             (assoc-ref %build-inputs "wiredtiger")))
        #:make-flags '("GUILE_AUTO_COMPILE=0")))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (inputs
@@ -2783,7 +2783,7 @@ for ODBC.")
     (inputs
      `(("glib" ,glib)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)
diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm
index 2911a0c550..7d75d7bffe 100644
--- a/gnu/packages/datastructures.scm
+++ b/gnu/packages/datastructures.scm
@@ -73,7 +73,7 @@ and heaps.")
         (base32 "1pk6wmi28pa8srb4szybrwfn71jldb61c5vgxsiayxcyg1ya4qqh"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (home-page "https://github.com/s-yata/marisa-trie")
diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm
index 221f23e42b..814271b0cb 100644
--- a/gnu/packages/debian.scm
+++ b/gnu/packages/debian.scm
@@ -226,7 +226,7 @@ unpacking them into a directory which can eventually be chrooted into.")
                         (invoke "po4a" "--no-backups" "po4a.conf"))
                       #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)
        ("po4a" ,po4a)))
@@ -315,7 +315,7 @@ other apt sources typically provided by open source developers.")
                                       ,(package-version perl)))
                #t))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)
        ("libtool" ,libtool)
@@ -379,7 +379,7 @@ handling the installation and removal of Debian software packages.")
        ("xz" ,xz)
        ("zlib" ,zlib)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (home-page "https://salsa.debian.org/brlink/reprepro")
     (synopsis "Debian package repository producer")
diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index 2913c348f3..5931ca13b8 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -412,7 +412,7 @@ server and embedded PowerPC, and S390 guests.")
            "0k55cy7x0hlc6rgpascl6ibhcfxaash3p9r9r8kwvbm3zag1rmac"))))
       (build-system gnu-build-system)
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("go" ,go)))
       (inputs
@@ -522,7 +522,7 @@ input.  Zzuf's behaviour is deterministic, making it easy to reproduce bugs.")
        ("gtk+" ,gtk+)
        ("intltool" ,intltool)
        ("automake" ,automake)
-       ("autoconf" ,autoconf)))
+       ("autoconf" ,autoconf-wrapper)))
     (inputs
      `(("readline" ,readline)))
     (propagated-inputs
diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm
index 538f3c7711..cb720ded70 100644
--- a/gnu/packages/dictionaries.scm
+++ b/gnu/packages/dictionaries.scm
@@ -330,7 +330,7 @@ translation engines from your terminal.")
     (inputs
      `(("libxml2" ,libxml2)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index f02e83a378..000e5f1802 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -774,7 +774,7 @@ passphrases.")
     (native-inputs
      `(("asciidoc" ,asciidoc)
        ("automake" ,automake)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("bash-completion" ,bash-completion)
        ("docbook-xsl" ,docbook-xsl)
        ("libtool" ,libtool)
@@ -1134,7 +1134,7 @@ that support this feature).")
        ("ndctl" ,ndctl)
        ("numactl" ,numactl)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (arguments
diff --git a/gnu/packages/distributed.scm b/gnu/packages/distributed.scm
index 0e5fe5ef69..d8b36d6e4c 100644
--- a/gnu/packages/distributed.scm
+++ b/gnu/packages/distributed.scm
@@ -68,7 +68,7 @@
               ("python" ,python)
               ("python-pyserial" ,python-pyserial)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm
index 6423eb124f..3e54c9d0cd 100644
--- a/gnu/packages/djvu.scm
+++ b/gnu/packages/djvu.scm
@@ -71,7 +71,7 @@
     (build-system gnu-build-system)
     (native-inputs
      ;; The 3.5.28 release tarball isn't bootstrapped.
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (inputs
@@ -109,7 +109,7 @@ utilities.")
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 9583cd3af9..ebcb75d6b3 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -434,7 +434,7 @@ Dynamic DNS update utility
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("automake" ,automake)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("libtool" ,libtool)))
     (inputs
      `(("libltdl" ,libltdl)
@@ -477,7 +477,7 @@ servers is included, and an up-to-date version is available at
            (lambda _
              (invoke "make" "configure"))))))
     (native-inputs
-     `(("autoconf" ,autoconf)))
+     `(("autoconf" ,autoconf-wrapper)))
     (inputs
      `(("libevent" ,libevent)
        ("libsodium" ,libsodium)))
@@ -517,7 +517,7 @@ the two.")
                              (string-append out "/share/man/man3"))
                #t))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -898,7 +898,7 @@ Extensions} (DNSSEC).")
                             (string-append tools "/share/man/man1"))
                #true))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)
@@ -1148,7 +1148,7 @@ attempts the update when it has changed.")
      (arguments
       '(#:configure-flags '("--disable-static"))) ;no need for libhsk.a
      (native-inputs
-      `(("autoconf" ,autoconf)
+      `(("autoconf" ,autoconf-wrapper)
         ("automake" ,automake)
         ("libtool" ,libtool)))
      (inputs
diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index eb3227ca63..89f4bd4ac6 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -158,7 +158,7 @@ release/xsl/current")
                                          "/xml/dtd/docbook/docbookx.dtd")))
                        #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)))
+     `(("autoconf" ,autoconf-wrapper)))
     (inputs `(("python" ,python-2)
               ("docbook-xml" ,docbook-xml)
               ("docbook-xsl" ,docbook-xsl)
@@ -192,7 +192,7 @@ markup) can be customized and extended by the user.")
                 "1xpws5lgzaqwgbc7sq6bp8adjxy8qb4qb9nj4vvpxamjgx3pny54"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)))
+     `(("autoconf" ,autoconf-wrapper)))
     (inputs
      `(("python" ,python)
        ("docbook-xml" ,docbook-xml)
diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm
index 11cfe586ac..81b4a03c8d 100644
--- a/gnu/packages/efi.scm
+++ b/gnu/packages/efi.scm
@@ -143,7 +143,7 @@ information.")
              (setenv "CC" "gcc")
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("bash" ,bash)
        ("help2man" ,help2man)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 81c44448e5..57db2ab408 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -235,7 +235,7 @@
      `(("guile" ,guile-2.2)))
     (native-inputs
      `(("emacs" ,emacs-minimal)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("texinfo" ,texinfo)))
     (home-page "https://nongnu.org/geiser/")
@@ -1020,7 +1020,7 @@ for editing Racket's Scribble documentation syntax in Emacs.")
         (base32 "0q2pb3w8s833fjhkzicciw2php4lsnismad1dnwgp2lcway757ra"))))
     (build-system gnu-build-system)
     (native-inputs
-    `(("autoconf" ,autoconf)
+    `(("autoconf" ,autoconf-wrapper)
       ("automake" ,automake)
       ("texinfo" ,texinfo)
       ("perl" ,perl)
@@ -1565,7 +1565,7 @@ or unexpected behavior inside an elisp configuration file (typically
                (base32
                 "0nvahdbjs12zg7zsk4gql02mvnv56cf1rwj2f5p42lwp3xvswiwp"))))
     (build-system gnu-build-system)
-    (native-inputs `(("autoconf" ,autoconf)
+    (native-inputs `(("autoconf" ,autoconf-wrapper)
                      ("texinfo" ,texinfo)
                      ("emacs" ,emacs-minimal)))
     (inputs `(("w3m" ,w3m)
@@ -2856,7 +2856,7 @@ during idle time, while Emacs is doing nothing else.")
            (add-after 'emacs-install 'emacs-make-autoloads
              (assoc-ref emacs:%standard-phases 'make-autoloads)))))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("pkg-config" ,pkg-config)
          ("emacs" ,emacs-minimal)))
@@ -2941,7 +2941,7 @@ type, for example: packages, buffers, files, etc.")
                   "1pqw7zbgxzwpig4xr0izc3z8h80c72i6bl5yi12br0d7aq6dbkvj"))))
       (build-system gnu-build-system)
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("pkg-config" ,pkg-config)
          ("texinfo" ,texinfo)
@@ -5016,7 +5016,7 @@ completion of relevant keywords.")
                   "@item left file"))
                #t)))))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)         ;for aclocal
          ("emacs" ,emacs-minimal)
          ("texinfo" ,texinfo)))
@@ -7496,7 +7496,7 @@ after buffer changes.")
              #t)))
        #:include (cons* ".*\\.el$" %default-include)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("emacs-test-simple" ,emacs-test-simple)))
     (propagated-inputs
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 98061c93ae..eab5ad6367 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -293,7 +293,7 @@ languages.")
           (base32
            "0igjm9kwiswn2dpiy2k9xikbdfc7njs07ry48fqz70anljj8y7y3"))))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ,@(package-native-inputs emacs)))
       (native-search-paths
        (list (search-path-specification
@@ -446,7 +446,7 @@ editor (with wide ints)" )
                  (base32
                   "0lvcvsz0f4mawj04db35p1dvkffdqkz8pkhc0jzh9j9x2i63kcz6"))))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("guile" ,guile-for-guile-emacs)
          ,@(package-native-inputs emacs)))
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index 16e9e6be76..ad9c6bfd2e 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -477,7 +477,7 @@ languages are C and C++.")
                 "0ndyfh51hiqyv2yscpj6qd091w7myxxjid3a6rx8f6k233vy826q"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -545,7 +545,7 @@ language.")
                   "1q536cp80v2bcy6xwk08f1r2ljyw13jchx3a1z7d3ni3vqql7rc6"))))
       (build-system gnu-build-system)
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("libtool" ,libtool)
          ("which" ,base:which)
@@ -1407,7 +1407,7 @@ debugging them, and more.")
      `(("mosquitto" ,mosquitto)))
     (native-inputs
      `(("automake" ,automake)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("config"
         ,(origin
               (method git-fetch)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index e3e0fcc218..41266c626d 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -263,7 +263,7 @@ turbo speed, networked multiplayer, and graphical enhancements.")
                 "02i648i50dwicv1vaql15rccv4g8h5blf5g6inv67lrfxpbkvlf0"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (inputs
      `(("sdl" ,sdl)
@@ -1406,7 +1406,7 @@ play them on systems for which they were never designed!")
              (chdir (string-append "libticables2-" ,version))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("autogen" ,autogen)
        ("automake" ,automake)
        ("gettext" ,gnu-gettext)
@@ -1449,7 +1449,7 @@ This is a part of the TiLP project.")
              (chdir (string-append "libticonv-" ,version))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -1487,7 +1487,7 @@ This is a part of the TiLP project.")
              (chdir (string-append "libtifiles2-" ,version))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext" ,gnu-gettext)
        ("libtool" ,libtool)
@@ -1528,7 +1528,7 @@ This is a part of the TiLP project.")
              (chdir (string-append "libticalcs2-" ,version))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext" ,gnu-gettext)
        ("libtool" ,libtool)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 7bbf732fc9..bd8dc71d2a 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -285,7 +285,7 @@ utilities.")
                 "0xfx6d0pyfrxr1c0nm4pbmb716hng78rgizaa6vsas9347n4kk1n"))
               (file-name (git-file-name name version))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("desktop-file-utils" ,desktop-file-utils)
        ("libtool" ,libtool)
@@ -872,7 +872,7 @@ language.")
                                  "/lib/libfive-guile")))
                #t)))))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("pkg-config" ,pkg-config)))
       (inputs
@@ -1271,7 +1271,7 @@ replacement for the OpenDWG libraries.")
                (("test -d [$]UUCPLOCK") "true"))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)
        ("pkg-config" ,pkg-config)))
@@ -1443,7 +1443,7 @@ developed at MIT to model electromagnetic systems.")
                 "0i37c9k6q1iglmzp9736rrgsnx7sw8xn3djqbbjw29zsyl3pf62c"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("bison" ,bison)
        ("flex" ,flex)
@@ -2073,7 +2073,7 @@ parallel computing platforms.  It also supports serial execution.")
          #:parallel-build? #f ; race condition
          #:configure-flags '("--disable-doc"))) ; we need octave-epstk
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("bison" ,bison)
          ("flex" ,flex)
@@ -2912,7 +2912,7 @@ GUI.")
          (file-name (git-file-name name version))))
       (build-system gnu-build-system)
       ;; The GUI, which we elide, requires tcl and tk.
-      (native-inputs `(("autoconf" ,autoconf)
+      (native-inputs `(("autoconf" ,autoconf-wrapper)
                        ("automake" ,automake)
                        ("bison" ,bison)
                        ("clisp" ,clisp)
@@ -2977,7 +2977,7 @@ GUI.")
         ("gtkmm" ,gtkmm-2)
         ("librsvg" ,librsvg)))
      (native-inputs
-      `(("autoconf" ,autoconf)
+      `(("autoconf" ,autoconf-wrapper)
         ("automake" ,automake)
         ("libtool" ,libtool)
         ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm
index 7b5dc70b5d..a5b7bdc912 100644
--- a/gnu/packages/erlang.scm
+++ b/gnu/packages/erlang.scm
@@ -58,7 +58,7 @@
     (build-system gnu-build-system)
     (native-inputs
      `(("perl" ,perl)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
 
        ;; Erlang's documentation is distributed in a separate tarball.
diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm
index 0e8b388cd1..ce2aa8f06d 100644
--- a/gnu/packages/fabric-management.scm
+++ b/gnu/packages/fabric-management.scm
@@ -60,7 +60,7 @@
        ("flex" ,flex)
 
        ;; The 3.3.21 'release' tarball isn't properly bootstrapped.
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (inputs
@@ -109,7 +109,7 @@ running the opensm daemon.")
     (outputs '("out" "lib"))
     (native-inputs
      ;; FIXME: needs rst2man for man pages
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("perl" ,perl)
@@ -219,7 +219,7 @@ testing InfiniBand networks.")
        ;; Be verbose so that compiler flags are displayed.
        #:make-flags '("V=1")))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 0741ba6044..e40381feee 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -275,7 +275,7 @@ always possible.")
         (base32 "1rvwq5v3rl14bqxjm1ibfapyicf0sa44nw7451v10kx39lp56ylp"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (inputs
@@ -478,7 +478,7 @@ from the bcachefs-tools package.  It is meant to be used in initrds.")
      `(#:configure-flags
        (list "--disable-static")))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -700,7 +700,7 @@ non-determinism in the build process.")
        ("flex" ,flex)
        ("bison" ,bison)
        ("libtool" ,libtool)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("cmocka" ,cmocka)))
     (inputs
@@ -775,7 +775,7 @@ All of this is accomplished without a centralized metadata server.")
     (build-system gnu-build-system)
     (home-page "https://github.com/sahlberg/libnfs")
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 7686f60675..e889736745 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -122,7 +122,7 @@
                 "0y5rad68b398arh0abr2wgiwybdw0i5a4dxz9s3fk9fgdbyn5gab"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)
@@ -1358,7 +1358,7 @@ a client based on Qt.  This is a fork of Bitcoin Core.")
                             (assoc-ref %build-inputs "opensp")
                             "/include/OpenSP"))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gengetopt" ,gengetopt)
        ("help2man" ,help2man)
@@ -1396,7 +1396,7 @@ following three utilities are included with the library:
         (base32 "1pan24g3d5csa004d7zvlizj4mv58ly5i579341isp944phl3g5v"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index e966d5d271..6375d7c651 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -1032,7 +1032,7 @@ can support most writing systems covered by Unicode.")
        ;; FIXME: texlive-kpathsea doesn't come with the library and headers
        (list "--without-kpathsea")))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (home-page "https://lcdf.org/type/")
     (synopsis "Multiple font manipulation tools")
diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
index bee87d9311..8909749f90 100644
--- a/gnu/packages/fpga.scm
+++ b/gnu/packages/fpga.scm
@@ -455,7 +455,7 @@ a hardware description and verification language. ")
              #t)))))
     (native-inputs
      `(("automake" ,automake)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("flex" ,flex)
        ("gettext" ,gnu-gettext)
        ("libtool" ,libtool)
@@ -513,7 +513,7 @@ using different abstraction levels.")
        (sha256
         (base32 "0kcs0p8i2hiw348xqqh49pmllqspbzh2ljwmia03b42md5h4x5vf"))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("bison" ,bison)
        ("flex" ,flex)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 56e53a73e2..27e45cb04c 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -147,7 +147,7 @@
                                  "/xml/dtd/docbook/"))))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("common"
         ,(origin
@@ -446,7 +446,7 @@ other applications that need to directly deal with input devices.")
                (("^.*\\./configure.*") ""))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (home-page "https://github.com/devnev/libxdg-basedir")
@@ -1397,7 +1397,7 @@ different sorts of messages in different formats.")
         (base32 "1pfw4g2cicw3ykxhsy743r0fc1yqbdrqxh2c5ha6am19dajcr95l"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -1626,7 +1626,7 @@ to applications simultaneously competing for fingerprint readers.")
                 "02bkfi6fyk4c0gh2avd897882ww5zl7qg7bzzf28qb57kvkvsvdj"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (inputs
@@ -2128,7 +2128,7 @@ fallback to generic Systray support if none of those are available.")
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("glib:bin" ,glib "bin")
@@ -2183,7 +2183,7 @@ and others.")
              #t)))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("xdg-desktop-portal" ,xdg-desktop-portal)
diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm
index b178063556..1146c78340 100644
--- a/gnu/packages/ftp.scm
+++ b/gnu/packages/ftp.scm
@@ -156,7 +156,7 @@ FTP browser, as well as non-interactive commands such as @code{ncftpput} and
     (build-system gnu-build-system)
     (native-inputs
      `(("automake" ,automake)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("gettext" ,gettext-minimal)))
     (home-page "http://weex.sourceforge.net/")
     (synopsis "Non-interactive client for FTP synchronization")
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 763230edfe..b1f478b8e7 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1895,7 +1895,7 @@ that parenthetically inclined game developers need to make 2D (and eventually
     (inputs `(("openssl" ,openssl)
               ("zlib" ,zlib)))
     (native-inputs `(("pkg-config" ,pkg-config)
-                     ("autoconf" ,autoconf)
+                     ("autoconf" ,autoconf-wrapper)
                      ("automake" ,automake)
                      ("libtool" ,libtool)))
     (synopsis "Programming language to create games")
@@ -2284,7 +2284,7 @@ rigid body physics library written in C.")
              (patch-shebang "get_version.py")
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("python" ,python)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 500e3e8a04..b9abec43d3 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -257,7 +257,7 @@
                     (#f "Side-scrolling game")))))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (inputs
      `(("libxi" ,libxi)
@@ -1139,7 +1139,7 @@ characters and lines resulting in a rainbow effect.")
                             "foobillardplus"))
                  #t))))))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("pkg-config" ,pkg-config)))
       (inputs
@@ -2906,7 +2906,7 @@ that beneath its ruins lay buried an ancient evil.")
                (("ncursesw5-config") "ncursesw6-config"))
              (invoke "sh" "autogen.sh"))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (inputs `(("ncurses" ,ncurses)))
     (home-page "https://rephial.org/")
@@ -3057,7 +3057,7 @@ is very small), and shoot at the adversaries that keep appear on the screen.")
          "1h9jz4m4s5l8c3figaq46ja0km1gimrkfxm4dg7mf4s84icmasbm"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (arguments
      '(#:phases
@@ -3141,7 +3141,7 @@ interface or via an external visual interface such as GNU XBoard.")
              (delete-file-recursively (string-append
                             out "/share/applications"))
              #t))))))
-    (native-inputs `(("autoconf" ,autoconf)
+    (native-inputs `(("autoconf" ,autoconf-wrapper)
                      ("automake" ,automake)
                      ("cxxtest" ,cxxtest)
                      ("gettext" ,gettext-minimal)
@@ -7051,7 +7051,7 @@ making Yamagi Quake II one of the most solid Quake II implementations available.
         (base32 "12v00z3p0ymi8f3w4b4bgl4c76irawn3kmd147r0ap6s9ssx2q6m"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)
        ("pkg-config" ,pkg-config)))
@@ -7811,7 +7811,7 @@ quotation from a collection of quotes.")
        ("hicolor-icon-theme" ,hicolor-icon-theme)))
     (native-inputs
      `(("unzip" ,unzip)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)
        ("libtool" ,libtool)
@@ -8673,7 +8673,7 @@ where the player draws runes in real time to effect the desired spell.")
        ("zlib" ,zlib)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gnu-gettext" ,gettext-minimal)
        ("libtool" ,libtool)
diff --git a/gnu/packages/genimage.scm b/gnu/packages/genimage.scm
index bd77e4dc33..36f6f43c0c 100644
--- a/gnu/packages/genimage.scm
+++ b/gnu/packages/genimage.scm
@@ -168,7 +168,7 @@
            (lambda _
              (invoke "make" "TEST_LOG_COMPILER=" "check"))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ;;; Note: cramfs is obsolete.
        ("dtc" ,dtc) ; for the tests
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 4747791bdf..7125158bb4 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -147,7 +147,7 @@
                                  "/xml/dtd/docbook/"))))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("docbook-xml" ,docbook-xml-4.3)
        ("gobject-introspection" ,gobject-introspection)
@@ -408,7 +408,7 @@ writing GeoTIFF information tags.")
                              (string-append "LIBTOOLIZE=" libtoolize "\n"))))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -1111,7 +1111,7 @@ dropping features at lower levels.")
          "1m8d3r1q1v05pkr8k9czrmb4xjszw6hvgsf3kn9pf0v14gpn4r8f"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (inputs
      `(("zlib" ,zlib)))
@@ -1709,7 +1709,7 @@ input file (in @code{.osm} or @code{.osm.pbf} format).")
         (base32 "1lzch0jf6yqhw391phhafzw4ghmiz98zkf698h4fmq109fa2vhqd"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (home-page "http://shapelib.maptools.org/")
diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index fc8e0098bb..ed1bd9c209 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -115,7 +115,7 @@
                 (string-append doc "/share/doc/poly2tri-c"))
                #t))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("doxygen" ,doxygen)
        ("libtool" ,libtool)
@@ -449,7 +449,7 @@ brushstrokes which is used by MyPaint and GIMP.")
         (base32 "0kcqz13vzpy24dhmrx9hbs6s7hqb8y305vciznm15h277sabpmw9"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (synopsis "Default brushes for MyPaint")
     (description "This package provides the default set of brushes for
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 6f06d27977..3298669173 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -178,7 +178,7 @@ the X-Consortium license.")
               ("glu" ,glu)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (synopsis "Font rendering library for OpenGL applications")
@@ -203,7 +203,7 @@ Polygon meshes, and Extruded polygon meshes.")
         (base32 "1fg323fk7wlv2xh6lw66wswgcv6qi8aaadk7c28h2f2lj1s7njnf"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (inputs
diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index c7e7394f43..a21806a3a1 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -75,7 +75,7 @@
                (("^\"\\$srcdir/configure\".*") ""))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     ;; When Arc is missing an icon, it looks in the Moka icon theme for it.
     (propagated-inputs
@@ -142,7 +142,7 @@ the Obsidian icon theme.")
              (substitute* "meson.build"
                (("meson.add_install_script.*") "")))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (synopsis "Faba icon theme")
     (description
@@ -626,7 +626,7 @@ notebooks and tiling window managers.")
              (setenv "HOME" (getcwd))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("glib" ,glib "bin")             ; for glib-compile-resources
        ("gnome-shell" ,gnome-shell)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5039e9b95a..050c06393a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -504,7 +504,7 @@ bindings.")
                                  "/xml/dtd/docbook/"))))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("docbook-xml" ,docbook-xml-4.1.2)
        ("gettext" ,gettext-minimal)
@@ -760,7 +760,7 @@ of known objects without needing a central registrar.")
              (delete-file "autogen.sh")
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("docbook-xml" ,docbook-xml-4.3)
        ("gettext" ,gettext-minimal)
@@ -2410,7 +2410,7 @@ GNOME Desktop.")
                 "154qcr0x6f68f4q526y87imv0rscmp34n47nk1pp82rsq52h2zna"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("glib" ,glib "bin")             ; for glib-genmarshal, etc.
        ("gnome-common" ,gnome-common)
@@ -2539,7 +2539,7 @@ GNOME Desktop.")
        ("glib" ,glib) ; for m4 macros
        ("python" ,python-2) ;for tests
        ("intltool" ,intltool)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libxslt" ,libxslt) ;for documentation
        ("docbook-xml" ,docbook-xml-4.2)
@@ -2975,7 +2975,7 @@ database is translated at Transifex.")
      `(("pkg-config" ,pkg-config)
        ("desktop-file-utils" ,desktop-file-utils)
        ("glib" ,glib)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("intltool" ,intltool)
        ("xmlto" ,xmlto)
@@ -4539,7 +4539,7 @@ and objects.")
        ("gtk-doc" ,gtk-doc)
        ("intltool" ,intltool)
        ("which" ,which)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (propagated-inputs
@@ -7267,7 +7267,7 @@ to display dialog boxes from the commandline and shell scripts.")
        ("pkg-config" ,pkg-config)
        ("xorg-server" ,xorg-server-for-tests)
        ;; For git build
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (propagated-inputs
@@ -9150,7 +9150,7 @@ documents and diagrams, playing media, scanning, and much more.")
                  (("-Werror") ""))
                #t)))))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("gnome-common" ,gnome-common)
          ("intltool" ,intltool)
@@ -9638,7 +9638,7 @@ compiled.")
        ("pkg-config" ,pkg-config)
 
        ;; The 0.2.4 ‘release’ tarball isn't bootstrapped.
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("which" ,which)))
@@ -9773,7 +9773,7 @@ is suitable as a default application in a Desktop environment.")
          "0l0g5x8g6dwhf5ksnqqrjjsycy57kcvdslkmsr6bl3vrsjd7qml3"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gtk+:bin" ,gtk+ "bin")
        ("intltool" ,intltool)
@@ -10504,7 +10504,7 @@ configurable file renaming. ")
     (native-inputs `(("boost" ,boost)
                      ("pkg-config" ,pkg-config)
                      ("gettext" ,gettext-minimal)
-                     ("autoconf" ,autoconf)
+                     ("autoconf" ,autoconf-wrapper)
                      ("autoconf-archive" , autoconf-archive)
                      ("automake" ,automake)
                      ("libtool" ,libtool)
@@ -11933,7 +11933,7 @@ developed with the aim of being used with the Librem 5 phone.")
        ("openssl" ,openssl)
        ("vala" ,vala)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("autoconf-archive" ,autoconf-archive)
        ("automake" ,automake)
        ("glib:bin" ,glib "bin")
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index e802777eda..20935e8b5e 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -450,7 +450,7 @@ gpgpme starting with version 1.7.")
                                       "/bin:" (getenv "PATH")))))))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("texinfo" ,texinfo)
        ("guile" ,guile-3.0)))
@@ -879,7 +879,7 @@ passphrase when @code{gpg} is run and needs it.")))
            (lambda _
              (invoke "sh" "autogen.sh"))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)
        ,@(package-native-inputs pinentry-tty)))
@@ -928,7 +928,7 @@ passphrase when @code{gpg} is run and needs it.")))
            (lambda* rest
              (invoke "make" "installcheck"))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("autoconf-archive" ,autoconf-archive)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)
diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm
index 012afebd01..819b419f0f 100644
--- a/gnu/packages/gnustep.scm
+++ b/gnu/packages/gnustep.scm
@@ -260,7 +260,7 @@ on.")
        ("libxpm" ,libxpm)))
     ;; wmclock requires autoreconf to generate its configure script.
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (home-page "https://www.dockapps.net/wmclock")
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 837096395c..02cde49fe6 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -407,7 +407,7 @@ in C/C++.")
              (delete-file "js/src/tests/shell/os.js")
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("which" ,which)
        ("perl" ,perl)
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index 86c4b98bf1..3b8a7a47eb 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -444,7 +444,7 @@ of the Louvain algorithm, for a number of different methods.")
          "01cm7ay1njkfsdnmnvh5zwc7wg7x189hq1vbfhh9p3ihrbnmqzh8"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (synopsis "Embedding of planar graphs")
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 7cb4aecec2..50cff73797 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -248,7 +248,7 @@ framebuffer graphics, audio output and input event.")
                (("^.*\\$srcdir/configure.*") ""))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("perl" ,perl)
@@ -310,7 +310,7 @@ minimum of resource usage and overhead.")
         (base32 "11f3ypg0sdq5kj69zgz6kih1yrzgm48r16spyvzwvlswng147410"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -410,7 +410,7 @@ objects!")
       (native-inputs
        `(("which" ,which)
          ("pkg-config" ,pkg-config)
-         ("autoconf" ,autoconf)
+         ("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("intltool" ,intltool)
          ("libtool" ,libtool)
@@ -1262,7 +1262,7 @@ virtual reality, scientific visualization and modeling.")
                   #t))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (inputs
@@ -1509,7 +1509,7 @@ and understanding different BRDFs (and other component functions).")
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("libtool" ,libtool)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (inputs
      `(("libx11" ,libx11)
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index b5c4774d5c..4ce977d79f 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -159,7 +159,7 @@ interfaces for other technical domains.")
              (replace 'bootstrap
                (lambda _ (invoke (which "sh") "autogen.sh" "NOCONFIG") #t))))))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("libtool" ,libtool)
          ("flex" ,flex)
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index b582585d75..50b6815623 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -329,7 +329,7 @@ applications that want audio visualisation and audio visualisation plugins.")
         (base32 "141jg70fim276i8k2kyypm84gy89i1k9mm4yf68mfwnybvjw1d6n"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)
        ("gnome-common" ,gnome-common)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index f458366fb6..360bfe007b 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1064,7 +1064,7 @@ exceptions, macros, and a dynamic programming environment.")
                            (find-files module-dir "\\.scm$"))
                  #t))))))
       (native-inputs `(("pkg-config" ,pkg-config)
-                       ("autoconf" ,autoconf)
+                       ("autoconf" ,autoconf-wrapper)
                        ("automake" ,automake)
                        ("libtool" ,libtool)
                        ("texinfo" ,texinfo)))
@@ -1894,7 +1894,7 @@ misspelled words in a GtkTextView widget.")
         (base32 "05xi29v2y0rvb33fmvrz7r9j4l858qj7ngwd7dp4pzpkkaybjln0"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("intltool" ,intltool)
        ("pkg-config" ,pkg-config)))
@@ -2032,7 +2032,7 @@ independent of your desktop environment, and supports global key bindings.")
      `(("gspell" ,gspell)
        ("gtk+" ,gtk+)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("intltool" ,intltool)
        ("pkg-config" ,pkg-config)))
@@ -2226,7 +2226,7 @@ library for drawing.")
        ("gtk+" ,gtk+)
        ("libxml2" ,libxml2)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gobject-introspection" ,gobject-introspection)
        ("libtool" ,libtool)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index ccdf99ffa8..73d110f568 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -275,7 +275,7 @@ AM_SCM_LOG_FLAGS =  --no-auto-compile -s")
        `(("guile" ,guile-2.0)))
       (native-inputs
        `(("zip" ,zip) ; for tests
-         ("autoconf" ,autoconf)
+         ("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("texinfo" ,texinfo)))
       (synopsis "Package manager for Guile")
@@ -414,7 +414,7 @@ and then run @command{scm example.scm}.")
                (base32
                 "031wm13srak3wsnll7j2mbbi29g1pcm4swdb71ds9yn567pn20qw"))))
     (build-system gnu-build-system)
-    (native-inputs `(("autoconf" ,autoconf)
+    (native-inputs `(("autoconf" ,autoconf-wrapper)
                      ("automake" ,automake)
                      ("guile" ,guile-2.2)
                      ("pkg-config" ,pkg-config)
@@ -476,7 +476,7 @@ you send to a FIFO file.")
                 "1mxbbcsmbjfnh4yydqz44ihbkdnzdwz38xanaam128arlb7hwr8n"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)
        ("texinfo" ,texinfo)))
@@ -730,7 +730,7 @@ HTML (via SXML) or any other format for rendering.")
                   #t))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (inputs
@@ -946,7 +946,7 @@ works with Guile 1.4.x to 2.0.x.")
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("guile" ,guile-3.0)))
     (inputs
@@ -1240,7 +1240,7 @@ format.")
            "1a15gdlbmzx220xg82fgyd0zk2wqn13ddmzs13nhgfzx8d5cns68"))))
       (native-inputs
        `(("pkg-config" ,pkg-config)
-         ("autoconf" ,autoconf)
+         ("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("texinfo" ,texinfo))))))
 
@@ -1275,7 +1275,7 @@ format.")
      `(("guile" ,guile-3.0)
        ("newt" ,newt)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (synopsis "Guile bindings to Newt")
@@ -1311,7 +1311,7 @@ Scheme by using Guile’s foreign function interface.")
                 "1vblf3d1bbwna3l09p2ap5y8ycvl549bz6whgk78imyfmn28ygry"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (inputs
@@ -1349,7 +1349,7 @@ microblogging service.")
     (propagated-inputs
      `(("guile-bytestructures" ,guile-bytestructures)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (synopsis "Guile bindings to GNU Parted")
@@ -1522,7 +1522,7 @@ SQL databases.  This package implements the interface for SQLite.")
       (native-inputs
        `(("pkg-config" ,pkg-config)
          ("automake" ,automake)
-         ("autoconf" ,autoconf)
+         ("autoconf" ,autoconf-wrapper)
          ("perl" ,perl)
          ("libtool" ,libtool)
          ("guile-dbi-bootstrap" ,guile-dbi-bootstrap)))
@@ -1553,7 +1553,7 @@ PostgreSQL.")
                 "09028ylbddjdp3d67zdjz3pnsjqz6zs2bfck5rr3dfaa0qjap40n"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)
        ("texinfo" ,texinfo)))
@@ -1644,7 +1644,7 @@ above command-line parameters.")
                           ,''("hall"))
                         #t))))))))
     (native-inputs
-      `(("autoconf" ,autoconf)
+      `(("autoconf" ,autoconf-wrapper)
         ("automake" ,automake)
         ("pkg-config" ,pkg-config)
         ("texinfo" ,texinfo)))
@@ -1795,7 +1795,7 @@ The library is shipped with documentation in Info format and usage examples.")
     (inputs
      `(("guile" ,guile-3.0)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("emacs" ,emacs-minimal)
        ("python" ,python)
@@ -1916,7 +1916,7 @@ capabilities.")
           (base32 "0r472hvmf447kqvkahp1wy4irb5gy8y793hm8r9rc511smdx66cw"))))
       (build-system gnu-build-system)
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("texinfo" ,texinfo)
          ("gettext" ,gettext-minimal)
@@ -2448,7 +2448,7 @@ interface for reading articles in any format.")
     (arguments
      '(#:make-flags '("GUILE_AUTO_COMPILE=0")))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)
        ("guile" ,guile-3.0)))
@@ -2623,7 +2623,7 @@ format is also supported.")
        `(("guile-cairo" ,guile-cairo)
          ("guile-rsvg" ,guile-rsvg)))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("librsvg" ,librsvg)
          ("pkg-config" ,pkg-config)
@@ -2746,7 +2746,7 @@ completion, a simple mode line, etc.")
     (inputs
      `(("guile" ,guile-3.0)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (home-page "https://gitlab.com/tampe/stis-parser")
@@ -2795,7 +2795,7 @@ chunks can be expressions as well as simple tokens.")
     (inputs
      `(("guile" ,guile-3.0)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -2867,7 +2867,7 @@ serializing continuations or delimited continuations.")
        ("guile-readline" ,guile-readline)
        ("guile-stis-parser" ,guile-stis-parser)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -3057,7 +3057,7 @@ denote the invalidity of certain code paths in a Scheme program.")
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (inputs
@@ -3292,7 +3292,7 @@ in C using Gtk+-3 and WebKitGtk.")
                     #t))))
       (build-system gnu-build-system)
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("pkg-config" ,pkg-config)
          ("guile" ,guile-2.2)))
@@ -3317,7 +3317,7 @@ perform geometrical transforms on JPEG images.")
                 "0p0ha6prp7pyadp61clbhc6b55023vxzfwy14j2qygb2mkq7fhic"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("bash" ,bash)
        ("pkg-config" ,pkg-config)
@@ -3765,7 +3765,7 @@ gnome-keyring, and many more.")
                     #t))))
       (build-system gnu-build-system)
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("pkg-config" ,pkg-config)
          ("texinfo" ,texinfo)))
@@ -3815,7 +3815,7 @@ as signed sessions, multipart message support, etc.")
                (setenv "HOME" "/tmp")   ; for ~/.hall
                (invoke "hall" "dist" "-x"))))))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("guile" ,guile-3.0)
          ("guile-hall" ,guile-hall)
@@ -3860,7 +3860,7 @@ over, or update a value in arbitrary data structures.")
        ("xapian" ,xapian)
        ("zlib" ,zlib)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("autoconf-archive" ,autoconf-archive)
        ("automake" ,automake)
        ("libtool" ,libtool)
@@ -3900,7 +3900,7 @@ models and also supports a rich set of boolean query operators.")
                       "1yiagi55ncq1x7s9n7salzywjm4l96y3n7y3s47a9anvz87mrmim"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("guile" ,guile-2.2)
        ("texinfo" ,texinfo)
@@ -3934,7 +3934,7 @@ according to Bitorrent BEP003.")
       (arguments
        `(#:configure-flags '("--enable-gnutls=yes")))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("texinfo" ,texinfo)))
       (inputs
@@ -3982,7 +3982,7 @@ Relay Chat} (IRC).")
                  (("/ccache") "/site-ccache"))
                #t)))))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)))
       (inputs
        `(("guile" ,guile-3.0)))
@@ -4016,7 +4016,7 @@ WebSocket protocol as defined by RFC 6455.")
      `(("guile" ,guile-3.0)))
     (native-inputs
      `(("automake" ,automake)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("pkg-config" ,pkg-config)
        ("texinfo" ,texinfo)))
     (home-page "https://framagit.org/tyreunom/guile-rdf")
@@ -4057,7 +4057,7 @@ manipulating graphs and datasets.")
      `(("guile" ,guile-3.0)))
     (native-inputs
      `(("automake" ,automake)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("pkg-config" ,pkg-config)
        ("texinfo" ,texinfo)))
     (home-page "https://framagit.org/tyreunom/guile-jsonld")
@@ -4251,7 +4251,7 @@ errors.")
        `(("guile" ,guile-3.0)
          ("avahi" ,avahi)))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("libtool" ,libtool)
          ("pkg-config" ,pkg-config)
@@ -4288,7 +4288,7 @@ Discovery (DNS-SD).")
     (native-inputs
      `(("guile" ,guile-3.0)
        ("texinfo" ,texinfo)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("autoconf-archive" ,autoconf-archive)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)
@@ -4320,7 +4320,7 @@ directory of its argument if it does not exist.")
          "1p8sapiv5im18rjnzc8xnw6y7dr661rycf9g10z5ww0dl4rfz3z1"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (propagated-inputs
@@ -4351,7 +4351,7 @@ JWT.  Supported algorithms: HS256, HS384, HS512.")
     (build-system gnu-build-system)
     (arguments `())
     (native-inputs
-      `(("autoconf" ,autoconf)
+      `(("autoconf" ,autoconf-wrapper)
         ("automake" ,automake)
         ("pkg-config" ,pkg-config)
         ("texinfo" ,texinfo)))
@@ -4380,7 +4380,7 @@ tools.")
     (build-system gnu-build-system)
     (arguments '())
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)
        ("texinfo" ,texinfo)
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 21f1329c00..948a20a7ff 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -496,7 +496,7 @@ GNU@tie{}Guile.  Use the @code{(ice-9 readline)} module and call its
                  (invoke "sh" "autogen.sh")
                  #t))))))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("libtool" ,libtool)
          ("flex" ,flex)
@@ -660,7 +660,7 @@ Guile's foreign function interface.")
               (file-name (string-append name "-" version "-checkout"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("guile" ,guile-3.0)
        ("pkg-config" ,pkg-config)))
@@ -707,7 +707,7 @@ Guile's foreign function interface.")
                         (install-file "README.md" doc)
                         #t))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)
        ("guile" ,guile-3.0)))
@@ -792,7 +792,7 @@ manipulate repositories of the Git version control system.")
      '(#:make-flags
        '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)
        ,@(if (%current-target-system)
@@ -828,7 +828,7 @@ Guile's foreign function interface.")
      '(#:make-flags
        '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)
        ,@(if (%current-target-system)
@@ -860,7 +860,7 @@ pure Scheme by using Guile's foreign function interface.")
                 "1c8l7829b5yx8wdc0mrhzjfwb6h9hb7cd8dfxcr71a7vlsi86310"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)
        ("guile" ,guile-3.0)))
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index 10672f52f3..85b229f1c1 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -153,7 +153,7 @@ human-readable format and checks if it conforms to the standards.")
         (base32 "0krwwydyvb9224r884y1mlmzyxhlfrcqw73vi1j8787rl0gl5a2i"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)
        ("libtool" ,libtool)
@@ -393,7 +393,7 @@ supported by the Linux kernel.")
           (base32 "0zwrkqfxd671iy69v3q0844gfdpm1yk51i9qh2rqc969bd8glxga"))))
       (build-system gnu-build-system)
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("pkg-config" ,pkg-config)))
       (inputs
@@ -532,7 +532,7 @@ Simply put, it is a USB device whitelisting tool.")
      `(("glib" ,glib)
        ("gtk+" ,gtk+-2)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("intltool" ,intltool)
        ("libtool" ,libtool)
        ("glib" ,glib "bin")
diff --git a/gnu/packages/hexedit.scm b/gnu/packages/hexedit.scm
index e5ea18cde6..1b0df659a6 100644
--- a/gnu/packages/hexedit.scm
+++ b/gnu/packages/hexedit.scm
@@ -60,7 +60,7 @@
                                "/share/man/man1/hexedit.1.gz\"")))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (inputs
      `(("man-db" ,man-db)
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 47c7e17573..9eaa269ec1 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -107,7 +107,7 @@ GNU/Hurd."
 
            #:tests? #f))
        (native-inputs
-        `(("autoconf" ,autoconf)
+        `(("autoconf" ,autoconf-wrapper)
           ("automake" ,automake)
           ("texinfo" ,texinfo-4)))
        (home-page "https://www.gnu.org/software/hurd/microkernel/mach/gnumach.html")
@@ -188,7 +188,7 @@ communication.")
      (build-system gnu-build-system)
      (native-inputs
       `(("mig" ,mig)
-        ("autoconf" ,autoconf)
+        ("autoconf" ,autoconf-wrapper)
         ("automake" ,automake)))
      (arguments
       `(#:phases
@@ -320,7 +320,7 @@ Hurd-minimal package which are needed for both glibc and GCC.")
     (native-inputs
      `(("mig" ,mig)
        ("perl" ,perl)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("texinfo" ,texinfo-4)))
     (supported-systems (cons "i686-linux" %hurd-systems))
@@ -540,7 +540,7 @@ exec ${system}/rc \"$@\"
        ("grep" ,grep)
        ("util-linux" ,util-linux)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libgcrypt" ,libgcrypt)                   ;for 'libgcrypt-config'
        ("pkg-config" ,pkg-config)
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index fda9e4cb7b..3b976ef88d 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -148,7 +148,7 @@ actions.")
        ("libpng" ,libpng)
        ("gtk+" ,gtk+)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("glib" ,glib "bin")                       ; glib-gettextize
        ("intltool" ,intltool)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 958f1dcc59..6f846ae247 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -628,7 +628,7 @@ collection of tools for doing simple manipulations of TIFF images.")
     (build-system gnu-build-system)
     (native-inputs
      `(("gnuplot" ,gnuplot)             ;needed for test suite
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -697,7 +697,7 @@ arithmetic ops.")
                                 (delete-file "autogen.sh")
                                 #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("python" ,python-minimal-wrapper)))     ;for tests
@@ -1296,7 +1296,7 @@ language bindings to VIGRA.")
        ("libpng" ,libpng)
        ("libtiff" ,libtiff)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (arguments
@@ -1472,7 +1472,7 @@ ISO/IEC 15444-1).")
          (base32 "1dqyrq3p8bkgvj4ci50ac342hjnhyz6xxvhiwp7wpi3v3nbj7s02"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (synopsis "Scaling, colorspace conversion, and dithering library")
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index c47293b5c1..9d996a4de9 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -446,7 +446,7 @@ of Jami."
        ;; See https://git.jami.net/savoirfairelinux/ring-daemon/issues/24.
        ("pjproject" ,pjproject-jami)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index d6afb2e9d3..fd21cd9039 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -329,7 +329,7 @@ language.")
      (if (string-prefix? "aarch64" (or (%current-system)
                                        (%current-target-system)))
          ;; Additional packages needed for autoreconf.
-         `(("autoconf" ,autoconf)
+         `(("autoconf" ,autoconf-wrapper)
            ("automake" ,automake)
            ("libtool" ,libtool))
          '()))
@@ -759,7 +759,7 @@ machine.")))
            (add-after 'install 'install-data
              (lambda _ (invoke "make" "install-data"))))))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("libtool" ,libtool)
          ("gettext" ,gettext-minimal)
@@ -2276,7 +2276,7 @@ new Date();"))
        ("libxt" ,libxt)
        ("libxtst" ,libxtst)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("openjdk10" ,openjdk10)
        ("openjdk10:jdk" ,openjdk10 "jdk")
        ("make" ,gnu-make-4.2)
@@ -2323,7 +2323,7 @@ new Date();"))
        ("libxt" ,libxt)
        ("libxtst" ,libxtst)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("openjdk11" ,openjdk11)
        ("openjdk11:jdk" ,openjdk11 "jdk")
        ("make@4.2" ,gnu-make-4.2)
@@ -2366,7 +2366,7 @@ new Date();"))
        ("libxt" ,libxt)
        ("libxtst" ,libxtst)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("openjdk12:jdk" ,openjdk12 "jdk")
        ("make@4.2" ,gnu-make-4.2)
        ("pkg-config" ,pkg-config)
@@ -2412,7 +2412,7 @@ new Date();"))
        ("libxt" ,libxt)
        ("libxtst" ,libxtst)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("make@4.2" ,gnu-make-4.2)
        ("openjdk13:jdk" ,openjdk13 "jdk")
        ("pkg-config" ,pkg-config)
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index b3dc96f925..cdecb1c214 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -160,7 +160,7 @@ generator library for C++.")
                (copy-recursively "." (assoc-ref outputs "out"))
                #t)))))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("libtool" ,libtool)
          ("pkg-config" ,pkg-config)))
@@ -195,7 +195,7 @@ generator library for C++.")
                (copy-recursively "." (assoc-ref outputs "out"))
                #t)))))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("libtool" ,libtool)
          ("pkg-config" ,pkg-config)))
@@ -230,7 +230,7 @@ generator library for C++.")
                (copy-recursively "." (assoc-ref outputs "out"))
                #t)))))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("libtool" ,libtool)
          ("pkg-config" ,pkg-config)))
@@ -381,7 +381,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.")
     ;; - plist
     ;; - shairplay
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)
        ("icedtea" ,icedtea) ; needed at build-time only, mandatory
diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 93e125db7e..ef677f7cc6 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -161,7 +161,7 @@
          (add-after 'install 'qt-wrap
            (assoc-ref qt:%standard-phases 'qt-wrap)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("docbook-xml-4.3" ,docbook-xml-4.3)
        ("gettext" ,gettext-minimal)
@@ -314,7 +314,7 @@ Random Cage Fighting Birds, Cool Music etc.")
                 ""))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("perl" ,perl)
@@ -361,7 +361,7 @@ method, one of the most popular choices for Traditional Chinese users.")
                                       (assoc-ref outputs "python"))
                        "--root=/")))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("clang-format" ,clang)
        ("help2man" ,help2man)
@@ -403,7 +403,7 @@ Marburg.")
      `(#:configure-flags
        (list "--disable-static")))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("help2man" ,help2man)
        ("jdk" ,icedtea "jdk")
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 99382c991b..83dda1d4e6 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -834,7 +834,7 @@ Zoner Draw version 4 and 5.")
           "0qxlkd012r45ppd21kldbq9k5ac5nmxz290z6m2kch9l56v768k1"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (inputs
diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm
index cb0d45ce86..9e592b1822 100644
--- a/gnu/packages/libusb.scm
+++ b/gnu/packages/libusb.scm
@@ -369,7 +369,7 @@ I2C and SPI devices attached to the USB Hub.")
     (inputs
      `(("python" ,python)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)
@@ -579,7 +579,7 @@ devices.")
      `(("libusb" ,libusb)
        ("udev" ,eudev)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/lighting.scm b/gnu/packages/lighting.scm
index 4718795a8a..3aaf26b598 100644
--- a/gnu/packages/lighting.scm
+++ b/gnu/packages/lighting.scm
@@ -60,7 +60,7 @@
          ("pkg-config" ,pkg-config)
 
          ;; For git repository bootstrapping.
-         ("autoconf" ,autoconf)
+         ("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("libtool" ,libtool)))
       (inputs
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 1f960482fd..60dde40dc0 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1821,7 +1821,7 @@ slabtop, tload, top, vmstat, w, watch and sysctl.")
        ("libusb" ,libusb)
        ("python" ,python)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -2587,7 +2587,7 @@ Linux-based operating systems.")
     (build-system gnu-build-system)
 
     ;; The tarball lacks all the generated files.
-    (native-inputs `(("autoconf" ,autoconf)
+    (native-inputs `(("autoconf" ,autoconf-wrapper)
                      ("automake" ,automake)))
     (arguments
      '(#:phases
@@ -3233,7 +3233,7 @@ for systems using the Linux kernel.  This includes commands such as
                 "1m8avqccrhm38krlhp88a7v949f3hrzx060bbrr5dp5qw2nmw9j2"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (arguments
@@ -3415,7 +3415,7 @@ to the in-kernel OOM killer.")
                                "hwdb" "--update")))))))
        #:configure-flags (list "--enable-manpages")))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gperf" ,gperf)
        ("libtool" ,libtool)
@@ -4904,7 +4904,7 @@ Ridge, Joliet, and zisofs.")
      `(("texinfo" ,texinfo)
        ("bison" ,bison)
        ("flex" ,flex)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (home-page "https://www.nico.schottelius.org/software/gpm/")
@@ -5123,7 +5123,7 @@ obviously it can be shared with files outside our set).")
                (install-file "mkfs/f2fs_format_utils.h" out-include)
                #t))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -5652,7 +5652,7 @@ The collection contains a set of bandwidth and latency benchmark such as:
                            "--without-pkcs11"
                            "--without-rtlsdr")))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (inputs
@@ -5872,7 +5872,7 @@ native Linux file system, and has been part of the Linux kernel since version
                                          (assoc-ref %outputs "out")
                                          "/lib/libnfsidmap"))))
     (native-inputs
-     `(("autoconf" ,autoconf)))         ; 0.27 still needs autoheader
+     `(("autoconf" ,autoconf-wrapper)))         ; 0.27 still needs autoheader
     (home-page
      "http://www.citi.umich.edu/projects/nfsv4/crossrealm/libnfsidmap_config.html")
     (synopsis "NFSv4 support library for name/ID mapping")
@@ -6211,7 +6211,7 @@ monitoring tools for Linux.  These include @code{mpstat}, @code{iostat},
                 "90-backlight.rules" (string-append out "/lib/udev/rules.d"))
                #t))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (home-page "https://haikarainen.github.io/light/")
     (synopsis "GNU/Linux application to control backlights")
@@ -7225,7 +7225,7 @@ file systems.")
                     "byteswap_fix.diff"))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (home-page "https://github.com/jeremie-koenig/genext2fs")
     (synopsis "Generate ext2 file system as a normal user")
@@ -7299,7 +7299,7 @@ the superuser to make device nodes.")
             #t)))))
     (native-inputs
      `(;; For bootstrapping the package.
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("gettext" ,gettext-minimal)
@@ -7496,7 +7496,7 @@ of Linux application development.")
     (inputs
      `(("dbus" ,dbus)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("libtool" ,libtool)
        ("pkgconfig" ,pkg-config)
        ("automake" ,automake)))
@@ -7877,7 +7877,7 @@ kernel side implementation.")
      `(("lz4" ,lz4)
        ("libuuid" ,util-linux "lib")))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm
index c5097076b1..1815a2df66 100644
--- a/gnu/packages/lxde.scm
+++ b/gnu/packages/lxde.scm
@@ -573,7 +573,7 @@ in LXDE.")
        ("vala" ,vala)
 
        ;; For bootstrapping.
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (synopsis "Lightweight X11 session manager")
     (description
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index f8a0d11768..2f69922d4c 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -256,7 +256,7 @@ classification.")
        `(("pkg-config" ,pkg-config)
          ("dejagnu" ,dejagnu)
          ("swig" ,swig)
-         ("autoconf" ,autoconf)
+         ("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("libtool" ,libtool)))
       (home-page "http://ghmm.org")
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 483feaf38d..31dc96be4e 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -179,7 +179,7 @@
     (build-system gnu-build-system)
     (native-inputs
      `(("automake" ,automake)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("gettext" ,gettext-minimal)
        ("m4" ,m4)))                     ;for the test suite
     (inputs
@@ -1915,7 +1915,7 @@ scripts to prevent embarrassing errors later on.")
     (build-system gnu-build-system)
     (native-inputs
      `(("automake" ,automake)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("libtool" ,libtool)
        ("dovecot" ,dovecot)
        ("pkg-config" ,pkg-config)))
@@ -1966,7 +1966,7 @@ using libsodium sealed boxes.
       (build-system gnu-build-system)
       (native-inputs
        `(("automake" ,automake)
-         ("autoconf" ,autoconf)
+         ("autoconf" ,autoconf-wrapper)
          ("libtool" ,libtool)
          ("dovecot" ,dovecot)
          ("pkg-config" ,pkg-config)))
@@ -2286,7 +2286,7 @@ program's primary purpose.")
     (native-inputs
      `(("bison" ,bison)
        ("flex" ,flex)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (inputs
@@ -3825,7 +3825,7 @@ It is a replacement for the @command{urlview} program.")
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (arguments `(#:parallel-tests? #f)) ;tests are side-effect'y
     (home-page "https://github.com/verdammelt/tnef")
@@ -3889,7 +3889,7 @@ It is a replacement for the @command{urlview} program.")
          ("guile" ,guile-3.0)
          ("mailutils" ,mailutils)))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("pkg-config" ,pkg-config)))
       (home-page "https://git.elephly.net/software/mumi.git")
@@ -3912,7 +3912,7 @@ It is a replacement for the @command{urlview} program.")
                 "07h48s5qf08503pp9kafqbwipdqghiif22ghki7z8j67gyp04l6l"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (home-page "https://github.com/Yeraze/ytnef/")
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 8360be0197..1698f99d40 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -1456,7 +1456,7 @@ can be used as backgrounds in the MATE Desktop environment.")
         (base32 "1i2r4lw6xsk972yp15g5hm8p8xx9pp6jmcvvzbdq80xyx3x898qz"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("gettext" ,gettext-minimal)
        ("intltool" ,intltool)
        ("pkg-config" ,pkg-config)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index d38b0a3ad2..588206e5ab 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -757,7 +757,7 @@ halfspaces) or by their double description with both representations.")
                 "1wljl96yqxc9v8r49c37lscwkdp58kaacfb9p6s6nvpm31haax4y"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (inputs
@@ -2716,7 +2716,7 @@ bindings to almost all functions of SLEPc.")
         (base32 "1s9hyknfvhj86g3giayyf3dxzg23iij0rs7bdvj075v9qbyhqn9b"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (home-page "http://us.metamath.org/")
     (synopsis "Proof verifier based on a minimalistic formalism")
@@ -5959,7 +5959,7 @@ researchers and developers alike to get started on SAT.")
        ("gettext" ,gettext-minimal)
        ("intltool" ,intltool)
        ("automake" ,automake)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("libtool" ,libtool)
        ("doxygen" ,doxygen)
        ("file" ,file)))
@@ -6010,7 +6010,7 @@ cli.")
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)
        ("automake" ,automake)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("libtool" ,libtool)
        ("file" ,file)))
     (inputs
diff --git a/gnu/packages/mercury.scm b/gnu/packages/mercury.scm
index 5a2c85a79b..3e90135add 100644
--- a/gnu/packages/mercury.scm
+++ b/gnu/packages/mercury.scm
@@ -245,7 +245,7 @@ separate compilation, and numerous optimization/time trade-offs.")
            ;; C#, etc. in order to enable these extra grades.
            (native-inputs
             `(("mercury-minimal" ,mercury-minimal)
-              ("autoconf" ,autoconf)
+              ("autoconf" ,autoconf-wrapper)
               ("automake" ,automake)
               ,@(package-native-inputs mercury-minimal)))
            (synopsis "Pure logic programming language")))
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 941b0b5ca2..508e75d9aa 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -221,7 +221,7 @@ user interfaces in a fast and easy way.  It is based on GLib and ncurses.")
                                "/bin/sh")))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("bash" ,bash)
        ("doxygen" ,doxygen)
@@ -271,7 +271,7 @@ environment independent.")
              (delete-file "Makefile.in")
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("perl" ,perl)
@@ -306,7 +306,7 @@ conferencing.")
         (base32 "1k1gvmx1ikm0y1mdmm495rzkb00pl170jfaf2dy0n5aiiknkk7q3"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("doxygen" ,doxygen)
        ("libtool" ,libtool)
@@ -543,7 +543,7 @@ identi.ca and status.net).")
                                     "/lib/bitlbee/")))))))
     (inputs `(("glib" ,glib)))
     (native-inputs `(("pkg-config" ,pkg-config)
-                     ("autoconf" ,autoconf)
+                     ("autoconf" ,autoconf-wrapper)
                      ("automake" ,automake)
                      ("texinfo" ,texinfo)
                      ("libtool" ,libtool)
@@ -746,7 +746,7 @@ authentication.")
            #t))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf) ;; For bootstrap
+     `(("autoconf" ,autoconf-wrapper) ;; For bootstrap
        ("automake" ,automake) ;; For bootstrap
        ("check" ,check)
        ("dot" ,graphviz)
@@ -1385,7 +1385,7 @@ and prevent message loss.")
       (build-system gnu-build-system)
       (arguments `(#:tests? #f)) ; FIXME: tests hang, some fail.
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("libtool" ,libtool)
          ("check" ,check)
@@ -1874,7 +1874,7 @@ including psyced.")
        ("bison" ,bison)
        ("gettext" ,gettext-minimal)
        ("help2man" ,help2man)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (home-page "http://lpc.psyc.eu/")
     (synopsis "psycLPC is a multi-user network server programming language")
@@ -1981,7 +1981,7 @@ support, and more.")
                          (list bash coreutils less))))
                #t))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)
        ("texinfo" ,texinfo)))
@@ -2019,7 +2019,7 @@ is also scriptable and extensible via Guile.")
      `(("expat" ,expat)
        ("openssl" ,openssl)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -2049,7 +2049,7 @@ manual SSL certificate verification.")
      `(("expat" ,expat)
        ("openssl" ,openssl)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -2087,7 +2087,7 @@ are both supported).")
         "--enable-omemo"
         "--enable-icons-and-clipboard")))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("autoconf-archive" ,autoconf-archive)
        ("automake" ,automake)
        ("cmocka" ,cmocka)
diff --git a/gnu/packages/microcom.scm b/gnu/packages/microcom.scm
index 36d6bf21b7..ffa4f56a7b 100644
--- a/gnu/packages/microcom.scm
+++ b/gnu/packages/microcom.scm
@@ -41,7 +41,7 @@
     (build-system gnu-build-system)
     (inputs `(("readline" ,readline)))
     (native-inputs `(("automake" ,automake)
-                     ("autoconf" ,autoconf)))
+                     ("autoconf" ,autoconf-wrapper)))
     (home-page  "https://git.pengutronix.de/?p=tools/microcom.git")
     (synopsis "Minimalistic serial line terminal program")
  (description "Microcom is a minimalistic terminal program for accessing
diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm
index 75a422921c..5d61760733 100644
--- a/gnu/packages/monitoring.scm
+++ b/gnu/packages/monitoring.scm
@@ -523,7 +523,7 @@ written in Go with pluggable metric collectors.")
                 "1yz65jsbgdx4cmy16x24wz5di352lvyi7fp6jm90bhgl1vpzxlsx"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)
        ("libtool" ,libtool)))
@@ -559,7 +559,7 @@ written in Go with pluggable metric collectors.")
        ("curl" ,curl)
        ("libyajl" ,libyajl)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index 8263ea42cf..9c9ce3b315 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -415,7 +415,7 @@ other MPD frontends.")
        ("python" ,python)))             ; Sets GUIX_PYTHONPATH.
     ;; For bootstrapping.
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)
        ("which" ,which)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 4451082731..1892d47157 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2310,7 +2310,7 @@ export.")
                  (("exec wish ") (string-append "exec " (which ,wish) " ")))
                #t))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("gettext" ,gettext-minimal)
@@ -3625,7 +3625,7 @@ using the beets FetchArt plugin.")
          (add-before 'configure 'link-libm
            (lambda _ (setenv "LIBS" "-lm") #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("python" ,python)))
     (inputs
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index f8f7251f3f..6ca13cf31a 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -423,7 +423,7 @@ performance across unpredictable networks, such as the Internet.")
         (base32 "1x4fwzrlzvfa3vcpja97m8w5g9ir2zrh4zs7zksminrnmdrs0dsr"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -1693,7 +1693,7 @@ reusing frequently-requested web pages.")
                 "true"))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (inputs
      `(("ncurses" ,ncurses)))
@@ -1716,7 +1716,7 @@ live network and disk I/O bandwidth monitor.")
         (base32 "0ix2k64qg7x3w0bzdsbk1m50kcpq1ws59g3zkwiafvpwdr4gs2sg"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)
@@ -2878,7 +2878,7 @@ file for more details.")
          "--enable-webserver"
          "--with-denoise-level=0")))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext-minimal" ,gettext-minimal)
        ("perl" ,perl)))
@@ -2945,7 +2945,7 @@ networks using zeromq.  It has these key characteristics:
                 "17z2y2r9xkixhr9bxr50m77fh710afl30s7jdhbxrvf56vmal2jr"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (home-page "https://git.pengutronix.de/cgit/tools/libsocketcan")
@@ -3407,7 +3407,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.")
      `(("gnutls" ,gnutls)               ;included in opendht/crypto.h
        ("msgpack" ,msgpack)))           ;included in several installed headers
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)
        ("restinio" ,restinio)           ;headers only library
@@ -3478,7 +3478,7 @@ protocol daemons for BGP, IS-IS, LDP, OSPF, PIM, and RIP. ")
        ("readline" ,readline)))
     (native-inputs
      `(("asciidoc" ,asciidoc)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkgconfig" ,pkg-config)
diff --git a/gnu/packages/nfs.scm b/gnu/packages/nfs.scm
index 8370107939..26698e47a3 100644
--- a/gnu/packages/nfs.scm
+++ b/gnu/packages/nfs.scm
@@ -168,7 +168,7 @@ disk.  It allows for fast, seamless sharing of files across a network.")
              #t)))))
     (native-inputs
      `(("automake" ,automake)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("libtool" ,libtool)))
     (inputs
      `(("attr" ,attr)))
diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm
index 6d046eed1b..be9ea5a0e2 100644
--- a/gnu/packages/ntp.scm
+++ b/gnu/packages/ntp.scm
@@ -239,7 +239,7 @@ minimalist than ntpd.")
     (inputs `(("openssl" ,openssl-1.0)
               ("libevent" ,libevent)))
     (native-inputs `(("pkg-config" ,pkg-config)
-                     ("autoconf" ,autoconf)
+                     ("autoconf" ,autoconf-wrapper)
                      ("automake" ,automake)
                      ("libtool" ,libtool)))
     (synopsis "Extract remote time from TLS handshakes")
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 8a91a79c36..3191459ccd 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1560,7 +1560,7 @@ ocaml-migrate-parsetree")
     (build-system dune-build-system)
     (native-inputs
      `(("time" ,time)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (propagated-inputs
      `(("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned)))
@@ -1984,7 +1984,7 @@ lets the client choose the concrete timeline.")
     (arguments
      `(#:test-target "."))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("which" ,which)))
     (propagated-inputs `(("openssl" ,openssl)))
diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm
index 02c8be02fa..1cc6aa8fd1 100644
--- a/gnu/packages/onc-rpc.scm
+++ b/gnu/packages/onc-rpc.scm
@@ -152,7 +152,7 @@ from the protocol files.")
     (arguments
      `(#:configure-flags '("--disable-static")))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)
        ("libtool" ,libtool)
diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm
index d6a7aa2668..5d4c55650e 100644
--- a/gnu/packages/openldap.scm
+++ b/gnu/packages/openldap.scm
@@ -349,7 +349,7 @@ servers from Python programs.")
        ("python-argparse-manpage" ,python-argparse-manpage)
        ("python-ldap" ,python-ldap)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("doxygen" ,doxygen)
        ("gettext" ,gettext-minimal)
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 9fb8c40a31..bb274cf1c0 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1016,7 +1016,7 @@ written entirely in Python.")
        #:make-flags
        '("GUILE_AUTO_COMPILE=0")))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)
        ("texinfo" ,texinfo)
@@ -1102,7 +1102,7 @@ environments.")
            (delete 'strip))))             ; As the .go files aren't compatible
       (native-inputs
        `(("pkg-config" ,pkg-config)
-         ("autoconf" ,autoconf)
+         ("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("gnutls" ,gnutls)
 
@@ -1201,7 +1201,7 @@ outputs of those builds.")
                                  "guix-jupyter-kernel.scm")))
                #t))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)
 
@@ -1469,7 +1469,7 @@ sandboxed desktop applications on GNU/Linux.")
                         #t))))))
     (native-inputs
      `(("which" ,which)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (inputs
diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm
index 3a0c22b6d4..7aa0347a4b 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -148,7 +148,7 @@ and they are executed on lists of files, hosts, users or other items.")
              ("numactl" ,numactl)
              ("readline" ,readline)))
    (native-inputs
-    `(("autoconf" ,autoconf)
+    `(("autoconf" ,autoconf-wrapper)
       ("expect" ,expect)
       ("perl" ,perl)
       ("pkg-config" ,pkg-config)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index daea7ee8ad..72faa6cacb 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -122,7 +122,7 @@
            ;; The test suite wants to write to /homeless-shelter
            (lambda _ (setenv "HOME" (getcwd)))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)
        ("ghostscript" ,ghostscript)
@@ -383,7 +383,7 @@ Poppler PDF rendering library.")
     `(("zlib" ,zlib)
       ("libpng" ,libpng)))
    (native-inputs
-    `(("autoconf" ,autoconf)
+    `(("autoconf" ,autoconf-wrapper)
       ("automake" ,automake)
       ("libtool" ,libtool)))
    (home-page "http://libharu.org/")
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index bbae722caa..b89498e0bc 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -117,7 +117,7 @@ programs for plotting scientific data.")
                   "03049g7wnpyfi0r36ij4a46kc9l45jbanx02iklkjwav2n6jqnnk"))))
       (build-system gnu-build-system)
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("texinfo" ,texinfo)
          ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/poedit.scm b/gnu/packages/poedit.scm
index 3487636a3d..56ac55db9f 100644
--- a/gnu/packages/poedit.scm
+++ b/gnu/packages/poedit.scm
@@ -60,7 +60,7 @@
                             (assoc-ref %build-inputs "boost")
                             "/lib"))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext-minimal" ,gettext-minimal)
        ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/profiling.scm b/gnu/packages/profiling.scm
index 4d3c3faca0..84342ee926 100644
--- a/gnu/packages/profiling.scm
+++ b/gnu/packages/profiling.scm
@@ -63,7 +63,7 @@
        ("infiniband-diags" ,infiniband-diags "lib")
        ("net-tools" ,net-tools)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("gfortran" ,gfortran)))
     (arguments
      `(#:tests? #f ; no check target
diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm
index fa9a111d40..096e38a6a0 100644
--- a/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@ -477,7 +477,7 @@ volume levels of the sinks (get, set, decrease, increase, toggle mute, etc).")
              (delete-file "bootstrap.sh")
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (inputs
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 1409e05483..941276ad9a 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -89,7 +89,7 @@
               (base32 "1n6dbg13q8ga5qhg1yiszwly4jj0rxqr6f1xwm9waaly5z493xsd"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)))
+     `(("autoconf" ,autoconf-wrapper)))
     (inputs
      `(("fftw" ,fftw)
        ("fftwf" ,fftwf)))
@@ -264,7 +264,7 @@ and a dedicated receiver.")
        ("libsndfile" ,libsndfile)
        ("liquid-dsp" ,liquid-dsp)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (home-page "https://github.com/windytan/redsea")
     (synopsis "Lightweight RDS to JSON decoder")
@@ -466,7 +466,7 @@ to access different radio hardware.")
         (base32 "00plihnpym1gkfpflah8il9463qxzm9kx2f07jyvbkszpj8viq5g"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("bash-minimal" ,bash-minimal)
        ("doxygen" ,doxygen)
@@ -808,7 +808,7 @@ users.")
        (sha256
         (base32 "01h5ps0yq5vi1x9rkw742gx6a5fj02zhbpi89i412qdfbnyk35cv"))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("texinfo" ,texinfo)
diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm
index 0841c1fd8d..60f1f5f683 100644
--- a/gnu/packages/rdf.scm
+++ b/gnu/packages/rdf.scm
@@ -186,7 +186,7 @@ Lucene library, a high-performance, full-featured text search engine.")
        ("cyrus-sasl" ,cyrus-sasl)
        ("zlib" ,zlib)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -433,7 +433,7 @@ parser and serializer.")
      `(("serd" ,serd)
        ("zlib" ,zlib)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm
index a0d979e3bb..79d07be656 100644
--- a/gnu/packages/rpc.scm
+++ b/gnu/packages/rpc.scm
@@ -225,7 +225,7 @@ with the HTTP/2-based RPC framework gRPC.")
        (list (string-append "--with-boost="
                             (assoc-ref %build-inputs "boost")))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index ede5516088..72e5d58774 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -189,7 +189,7 @@ a focus on simplicity and productivity.")
                (("/bin/sh") (which "sh")))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)))))
+     `(("autoconf" ,autoconf-wrapper)))))
 
 (define-public ruby-3.0
   (package
diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm
index 7f060155ed..e24e1b7bc7 100644
--- a/gnu/packages/sagemath.scm
+++ b/gnu/packages/sagemath.scm
@@ -150,7 +150,7 @@ function for every found clique.")
          "0l68rikfr7k2l547gb3pp3g8cj5zzxwipm79xrb5r8ffj466ydxg"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (synopsis "Computations with braid groups")
@@ -176,7 +176,7 @@ in particular it computes normal forms of group elements.")
          "0sv3cwrf9v9sb5a8wbhjmarxvya13ma3j8y8592f9ymxlk5y0ldk"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (inputs
@@ -223,7 +223,7 @@ represented as strings.")
         (base32 "09d2p74x1arkydlxy6pw4p4byi7r8q7f29w373h4d8a215kadc6d"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -313,7 +313,7 @@ coefficients of which are modular integers.")
        (base32 "0qhgckd4fvbs40jw14mvw89rccv94d3df27kipd27hxd4cx7y80y"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index f0b74c8d40..7a0a2d9df3 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -74,7 +74,7 @@
                 "1vw570pvir73kl4y6fhd6ns936ankimkhb1ii43yh8lr0p1xqbcj"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (inputs
diff --git a/gnu/packages/sawfish.scm b/gnu/packages/sawfish.scm
index 26d8eba3b6..73048b2462 100644
--- a/gnu/packages/sawfish.scm
+++ b/gnu/packages/sawfish.scm
@@ -107,7 +107,7 @@ implementing both small and large scale systems.")
              (delete-file "autogen.sh")
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index e16f4dc1b9..bc594c693d 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -167,7 +167,7 @@
                #t))))))
     (native-inputs
      `(;; Autoconf, Automake, and Libtool are necessary for the FFI tests.
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("texlive" ,(texlive-updmap.cfg (list texlive-tex-texinfo)))
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index e4e452fec5..99d4d83fa1 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -355,7 +355,7 @@ SDL.")
            ;; generates linking errors.
            (lambda _ (invoke "autoreconf" "-vif"))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index c1641e8b5f..d8a794ec3c 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -116,7 +116,7 @@ readers and is needed to communicate with such devices through the
         (base32 "0590cz00cny749p99srv880gpgzvxaf9fwm2lghv3nw0qdsilss8"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("autoconf-archive" ,autoconf-archive)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)
@@ -520,7 +520,7 @@ operations.")
      `(("json-c" ,json-c-0.13)
        ("libressl" ,libressl)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("check" ,check)
@@ -564,7 +564,7 @@ verifying the cryptographic operations.")
        ("libu2f-server" ,libu2f-server)
        ("linux-pam" ,linux-pam)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("asciidoc" ,asciidoc)
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 0b628223bc..5e8ebd1ca8 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -323,7 +323,7 @@ into fish.")
             #t)))))
     (inputs `(("readline" ,readline)
               ("perl" ,perl)))
-    (native-inputs `(("autoconf" ,autoconf)
+    (native-inputs `(("autoconf" ,autoconf-wrapper)
                      ("automake" ,automake)
                      ("libtool" ,libtool)
                      ("pkg-config" ,pkg-config)))
@@ -388,7 +388,7 @@ written by Paul Haahr and Byron Rakitzis.")
               (patch-flags '("-p0"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("perl" ,perl)))
     (inputs
      `(("ncurses" ,ncurses)))
@@ -505,7 +505,7 @@ history mechanism, job control and a C-like syntax.")
                          (("command -p") "command ")
                          (("'command' -p") "'command' "))
                        #t)))))
-    (native-inputs `(("autoconf" ,autoconf)))
+    (native-inputs `(("autoconf" ,autoconf-wrapper)))
     (inputs `(("ncurses" ,ncurses)
               ("pcre" ,pcre)
               ("perl" ,perl)))
@@ -601,7 +601,7 @@ use of experts and novices alike.")
        `(("scheme48" ,scheme48)
          ("scheme48-rx" ,scheme48-rx)))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)))
       (home-page "https://github.com/scheme/scsh")
       (synopsis "Unix shell embedded in Scheme")
diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index c7a941dfa6..522f9e7105 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -344,7 +344,7 @@ below the current cursor position, scrolling the screen if necessary.")
                  (("ncursesw\\/curses.h") "ncurses.h")))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (inputs
diff --git a/gnu/packages/smalltalk.scm b/gnu/packages/smalltalk.scm
index ea1798ac13..a2d62d1220 100644
--- a/gnu/packages/smalltalk.scm
+++ b/gnu/packages/smalltalk.scm
@@ -62,7 +62,7 @@
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ;; XXX: To be removed with the next release of Smalltalk.
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     ;; TODO: These optional dependencies raise the closure size to ~1 GiB
diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm
index 66d8fca31b..f8fd75abac 100644
--- a/gnu/packages/speech.scm
+++ b/gnu/packages/speech.scm
@@ -197,7 +197,7 @@ based on human speech recordings.")
        ;; XXX: Some tests require an audio device.
        #:tests? #f))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("which" ,which)))
@@ -503,7 +503,7 @@ be used by the sighted.")
     (inputs
      `(("ncurses" ,ncurses)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("texinfo" ,texinfo)
        ("emacs" ,emacs-minimal)
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 11ced03f81..e958e60f4c 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -363,7 +363,7 @@ Additionally, various channel-specific options can be negotiated.")
                                      (string-append examples "/sssh.scm"))
                         (delete-file-recursively bin)
                         #t))))))
-    (native-inputs `(("autoconf" ,autoconf)
+    (native-inputs `(("autoconf" ,autoconf-wrapper)
                      ("automake" ,automake)
                      ("libtool" ,libtool)
                      ("texinfo" ,texinfo)
@@ -585,7 +585,7 @@ basis for almost any application.")
               (patches (search-patches "lsh-fix-x11-forwarding.patch"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("m4" ,m4)
        ("guile" ,guile-2.0)
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 9749e383ed..d844e9565e 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -111,7 +111,7 @@
        ("spread-sheet-widget" ,spread-sheet-widget)
        ("zlib" ,zlib)))
     (native-inputs
-     `(("autoconf" ,autoconf)           ;for tests
+     `(("autoconf" ,autoconf-wrapper)           ;for tests
        ("glib" ,glib "bin")             ;for glib-genmarshal
        ("perl" ,perl)
        ("pkg-config" ,pkg-config)
diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index f3d6e9013c..b91a454317 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -79,7 +79,7 @@
      `(#:tests? #f
        #:configure-flags '("--with-pcre")))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (inputs
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 881660780c..98e1499878 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -215,7 +215,7 @@ file system, and many more features.")
                  `("GUIX_PYTHONPATH" ":" prefix (,python-path))))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)
        ("glib:bin" ,glib "bin")
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index 00aabbde6c..1d20c74e70 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -251,7 +251,7 @@ Telegram project, for its use in telegram desktop client.")
                    "libcrypto opus alsa libpulse"))
                 #t)))))
        (native-inputs
-        `(("autoconf" ,autoconf)
+        `(("autoconf" ,autoconf-wrapper)
           ("automake" ,automake)
           ("libtool" ,libtool)
           ("pkg-config" ,pkg-config)))))))
@@ -673,7 +673,7 @@ a part of telegram-cli, but now being maintained separately.")
                         ("libs" "lib/tgl"))
                       args))))))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("libtool" ,libtool)
          ("pkg-config" ,pkg-config)))
@@ -757,7 +757,7 @@ a part of telegram-cli, but now being maintained separately.")
                          #:exclude ("tg-server.pub")))
                       args))))))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("libtool" ,libtool)
          ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 48e30abfc3..a03abb31cd 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -185,7 +185,7 @@ used as drop-in replacement for the non-free code from RFC 3591.")
                                     (find-files "lib" "\\.a$")))
                         #t))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)
@@ -466,7 +466,7 @@ supporting cryptographic kernel.")
            "0d269474kk1933c55hx4azw3sak5ycfrxkw6ida0sb2cm00kfich"))))
       (build-system gnu-build-system)
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("libtool" ,libtool)))
       (home-page "https://gitlab.savoirfairelinux.com/sflphone/libiax2")
@@ -843,7 +843,7 @@ your calls and messages.")
                 "pjmedia-test pjsip-test"))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index a9897ec623..eb12f30c55 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -117,7 +117,7 @@
              (for-each make-file-writable (find-files "po" "."))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)
        ("pkg-config" ,pkg-config)))
@@ -312,7 +312,7 @@ compatibility to existing emulators like xterm, gnome-terminal, konsole, etc.")
                            "1")))))))
       (native-inputs
        `(("pkg-config" ,pkg-config)
-         ("autoconf" ,autoconf)
+         ("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("libtool" ,libtool)
          ("libxslt" ,libxslt)                       ;to build the man page
@@ -979,7 +979,7 @@ per-line fullscreen terminal rendering, and keyboard input event reporting.")
        ("msgpack" ,msgpack)
        ("ncurses" ,ncurses)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (home-page "https://tmate.io/")
diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm
index b53b56fbf2..baf70fa0d7 100644
--- a/gnu/packages/texinfo.scm
+++ b/gnu/packages/texinfo.scm
@@ -277,7 +277,7 @@ Texi2HTML.")
      `(("ncurses" ,ncurses)
        ("readline" ,readline)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)
        ("libtool" ,libtool)
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index c66bea064b..7039166c70 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -917,7 +917,7 @@ and multiple fonts.")
         (base32 "060sachn33xpx3a609f09y97qq5ky17gvv686zbvrn618ij7bi8q"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("doxygen" ,doxygen)
        ("glib" ,glib "bin")
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 34da04d0d8..52ceb4eef3 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -254,7 +254,7 @@ nested include statements).")
                         ":"))
                #t))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gcc@5" ,gcc-5) ; doesn't build with later versions
        ("libtool" ,libtool)))
@@ -695,7 +695,7 @@ in a portable way.")
        ("slang" ,slang)))
     (native-inputs
      `(("libtool" ,libtool)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (home-page "https://www.lbreyer.com/dbacl.html")
@@ -733,7 +733,7 @@ categories.")
     (build-system gnu-build-system)
     (arguments `(#:tests? #f))  ; FIXME maketest.sh does not work.
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (home-page "https://github.com/williamh/dotconf")
diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index 677d31eb14..9e23a57980 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -208,7 +208,7 @@ rejects UDP traffic from the application you're using.")
        ("w3m" ,w3m)
        ("zlib" ,zlib)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (home-page "https://www.privoxy.org")
     (synopsis "Web proxy with advanced filtering capabilities for enhancing privacy")
diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm
index 8f4e9952f2..8b8384b366 100644
--- a/gnu/packages/upnp.scm
+++ b/gnu/packages/upnp.scm
@@ -150,7 +150,7 @@ and others.")
                ((".*LIBAVUTIL_LIBS.*") ""))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)))
     (inputs
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index e7cdb16373..d209f00132 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -2222,7 +2222,7 @@ output of the @code{git} command.")
        (sha256
         (base32 "1x1cbn2b27h5r0ah5xc06fkalfdci2ngrgd4wibxjw0h88h0nvgq"))))
     (build-system gnu-build-system)
-    (native-inputs `(("autoconf" ,autoconf)
+    (native-inputs `(("autoconf" ,autoconf-wrapper)
                      ("automake" ,automake)))
     (home-page "https://github.com/0-wiz-0/findnewest/releases")
     (synopsis "Print the modification time of the latest file")
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index c96bf7f5ae..60c53b87f5 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -237,7 +237,7 @@
         ;"--enable-pv3"
         ;"--enable-nuv"
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("iconv" ,libiconv)
        ("libtool" ,libtool)
@@ -513,7 +513,7 @@ and mmsh protocols.")
                (("is != NULL") "is.good()"))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -549,7 +549,7 @@ applications by providing high-level classes for commonly required tasks.")
      `(#:configure-flags
        (list "--disable-static")))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)
@@ -591,7 +591,7 @@ other software.")
        #:configure-flags
        (list "--with-sdl2")))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -751,7 +751,7 @@ mpv's powerful playback capabilities.")
     (build-system gnu-build-system)
     ;; XXX We need to run ./bootstrap because of the build system fixes above.
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (arguments `(#:configure-flags '("--enable-shared")
@@ -1268,7 +1268,7 @@ canvas operations.")
                 "0sjz0s0nrv7jcpvh1i432x3jza0y5yycmzw84cfncb2qby0i62rs"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (home-page "https://www.videolan.org/developers/libdca.html")
@@ -2816,7 +2816,7 @@ capabilities.")
                 "1krfdzc2x2vxv4nq9kiv1c09hgj525qn120ah91fw2ikq8ldvmx4"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("cython" ,python-cython)
        ("libtool" ,libtool)
@@ -3254,7 +3254,7 @@ present in modern GPUs.")
            (lambda _
              (invoke "autoreconf" "-fiv"))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
@@ -3397,7 +3397,7 @@ Other features include a live preview and live streaming.")
      ;; GCC 7.  Also, 'configure' does CXXFLAGS=$CFLAGS, hence this hack.
      '(#:configure-flags '("CFLAGS=-O2 -g -std=c++03")))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (inputs
      `(("sdl" ,sdl2)))
@@ -3538,7 +3538,7 @@ supported players in addition to this package.")
     (build-system  glib-or-gtk-build-system)
     (native-inputs
      `(("automake" ,automake)           ; GUI subpackage must be bootstrapped
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("intltool" ,intltool)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)
@@ -3646,7 +3646,7 @@ of modern, widely supported codecs.")
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -3784,7 +3784,7 @@ practically any type of media.")
                 "15ni9pnch6688m72swwax109a7mg4a08yx75qknrx7qa6dbyhz6h"))))
     ;; TODO add a Big Buck Bunny webm for tests.
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)
@@ -3844,7 +3844,7 @@ MPEG-2, MPEG-4, DVD (VOB)...
                (base32
                 "0rqg9z7s5bk7vlvjrs4gackzg7ib05a0dffi2ihsjf5a7kw7wcir"))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 5841bc98b2..58f9e7fd5f 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -664,7 +664,7 @@ server and embedded PowerPC, and S390 guests.")
 
        ;; These inputs are necessary to bootstrap the package, because we
        ;; have patched the build system.
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
 
        ;; For the documentation.
@@ -756,7 +756,7 @@ commodity hardware.")
     (arguments
      '(#:configure-flags '("--sysconfdir=/etc" "--localstatedir=/var")))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (inputs
      `(("util-linux" ,util-linux)
@@ -848,7 +848,7 @@ Guix to build virtual machines.")
                                  "variants.list"))
                       #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (inputs
      `(("debianutils" ,debianutils)
diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm
index b8979b2921..462b871c6a 100644
--- a/gnu/packages/vnc.scm
+++ b/gnu/packages/vnc.scm
@@ -68,7 +68,7 @@
                       (with-directory-excursion "vncviewer"
                         (invoke "make" "install")))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("gettext-minimal" ,gettext-minimal)
        ("automake" ,automake)))
     (inputs
@@ -109,7 +109,7 @@ application which is needed to connect to VNC servers.")
     (version (package-version tigervnc-client))
     (native-inputs
      `(("tigervnc-src" ,(package-source tigervnc-client))
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("gettext-minimal" ,gettext-minimal)
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index ba19f4aebc..0237a0876b 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -238,7 +238,7 @@ the entire VPN in a network namespace accessible only through SSH.")
                 "03323nnhb4y9nzwva04mq7xg03dvdrgp689g89f69jqc261skcqx"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (inputs
      `(("libevent" ,libevent)))
@@ -301,7 +301,7 @@ and probably others.")
                 "1qsfgpxg553s8rc9cyrc4k96z0pislxsdxb9wyhp8fdprkak2mw2"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("autotools" ,automake)
        ("pkg-config" ,pkg-config)))
     (inputs
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 1a0d0d7d63..98aa22311d 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -382,7 +382,7 @@ shader compilation.")
                           "2u"))
                        #t)))))
      (native-inputs
-      `(("autoconf" ,autoconf)
+      `(("autoconf" ,autoconf-wrapper)
         ("automake" ,automake)
         ("gettext" ,gettext-minimal)
         ("libtool" ,libtool)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index ed3bd65e82..79d1a3b090 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -761,7 +761,7 @@ CGI, authentication, output compression, URL rewriting and many more.")
     ;; Parallel building is not supported.
     (arguments `(#:parallel-build? #f))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     ;; This is an archived fork of the original home page, www.fastcgi.com.
@@ -800,7 +800,7 @@ APIs.")
                ((" -Werror") ""))
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (inputs
@@ -1385,7 +1385,7 @@ high performance.")
      ;; Parallel builds don't reliably succeed.
      `(#:parallel-build? #f))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("cunit" ,cunit)                 ; for tests
        ("libtool" ,libtool)
@@ -1468,7 +1468,7 @@ UTS#46.")
                       (invoke "autoreconf" "-vfi"))))))
     (native-inputs
      `(("automake" ,automake)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("libtool" ,libtool)))
     (synopsis "HTML validator and tidier")
     (description "HTML Tidy is a command-line tool and C library that can be
@@ -1878,7 +1878,7 @@ minimum to provide high performance operation.")
              (setenv "LIBSASS_VERSION" ,version)
              #t)))))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (home-page "https://sass-lang.com/libsass")
@@ -4716,7 +4716,7 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
          ("sqitch" ,sqitch)))
       (native-inputs
        `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))
-         ("autoconf" ,autoconf)
+         ("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("emacs-minimal" ,emacs-minimal)
          ("emacs-htmlize" ,emacs-htmlize)
@@ -4748,7 +4748,7 @@ PostgreSQL database.")
      `(#:tests? #f))         ;tests require bundling googletest sources
     ;; The release tarball lacks the generated files.
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (home-page "https://github.com/google/gumbo-parser")
@@ -5919,7 +5919,7 @@ configuration language.")
      `(("pkg-config" ,pkg-config)
 
        ;; For bootstrapping.
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
 
@@ -5954,7 +5954,7 @@ additional capabilities.")
      `(#:configure-flags '("--with-loadavg")
        #:tests? #f))                    ; no tests
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
@@ -7577,7 +7577,7 @@ compressed JSON header blocks.
 
                  #t))))))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("uglify-js" ,uglify-js)
          ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 084822f2c7..fc70c6a56c 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -419,7 +419,7 @@ Despite the name it should work with any X11 window manager.")
               (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (home-page "https://github.com/vivien/i3blocks")
@@ -568,7 +568,7 @@ prompt.")
        ("xcb-util-image" ,xcb-util-image)
        ("xcb-util-xrm" ,xcb-util-xrm)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (home-page "https://github.com/PandorasFox/i3lock-color")
@@ -1651,7 +1651,7 @@ Wayland compositors supporting the wlr-output-management protocol.")
                      ("texinfo" ,texinfo)
 
                      ;; To build the manual.
-                     ("autoconf" ,autoconf)
+                     ("autoconf" ,autoconf-wrapper)
                      ("automake" ,automake)))
     (inputs `(("cl-ppcre" ,sbcl-cl-ppcre)
               ("clx" ,sbcl-clx)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 6038c0eacb..fab9c0043d 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -346,7 +346,7 @@ application.")
     (arguments
      '(#:tests? #f))                              ;there is no test suite
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (inputs `(("libxmu" ,libxmu)
               ("libxt" ,libxt)))
@@ -426,7 +426,7 @@ X11 (yet).")
      `(("pkg-config" ,pkg-config)
 
        ;; For bootstrapping from git.
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (inputs
@@ -689,7 +689,7 @@ move windows, switch between desktops, etc.).")
          "12xq6glg70icwsvbnfw9gm4dahlbnrc7b6adpd0mpf89h4sj2gds"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("autoconf-archive" ,autoconf-archive)
        ("automake" ,automake)))
     (inputs
@@ -1339,7 +1339,7 @@ color temperature should be set to match the lamps in your room.")
                             (("^_") ""))
                           #t))))))
       (native-inputs
-       `(("autoconf" ,autoconf)
+       `(("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("libtool" ,libtool)
          ("pkg-config" ,pkg-config)
@@ -1802,7 +1802,7 @@ invert colors on a specific display/screen.")
     (arguments '(#:configure-flags `("--enable-sound"
                                      "--enable-wave"
                                      "--enable-alsa")))
-    (native-inputs `(("autoconf" ,autoconf)
+    (native-inputs `(("autoconf" ,autoconf-wrapper)
                      ("automake" ,automake)
                      ("pkg-config" ,pkg-config)
                      ("perl" ,perl)))
@@ -2229,7 +2229,7 @@ can optionally use some appearance settings from XSettings, tint2 and GTK.")
         (base32 "121ai4dc0v65qk12gn9w62ixly8hc8a5qrygkbb82vy8ck4jqxj7"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (inputs
@@ -2495,7 +2495,7 @@ After selection, the clip is put onto the PRIMARY and CLIPBOARD X selections.")
          "0qkq75grbd4wkx4nlvswgavpijk9ad0pzqyj89a0ayjsbsn36pqy"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("glib" ,glib "bin")
        ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm
index 8ed0e518a7..c853fcd315 100644
--- a/gnu/packages/xiph.scm
+++ b/gnu/packages/xiph.scm
@@ -217,7 +217,7 @@ work from the @code{speex} codec.")
        ("pulseaudio" ,pulseaudio)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (synopsis "Cross platform audio library")
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index c462cffac3..e40dba1f0d 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -260,7 +260,7 @@ project (but it is usable outside of the Gnome platform).")
     (inputs
      `(("glibmm" ,glibmm)))
     (native-inputs
-     `(("autoconf" ,autoconf)
+     `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("doxygen" ,doxygen)
        ("docbook-xml" ,docbook-xml)
@@ -2320,7 +2320,7 @@ modular implementation of XML-RPC for C and C++.")
        ("libxml2" ,libxml2)             ;for XML_CATALOG_DIR
        ("xmlto" ,xmlto)
        ;; Dependencies to regenerate the 'configure' script.
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)
        ("libtool" ,libtool)))
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 0aa87f850d..26a70941c1 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2894,7 +2894,7 @@ framebuffer device.")
          ("zlib" ,zlib)))
       (native-inputs
        `(("pkg-config" ,pkg-config)
-         ("autoconf" ,autoconf)
+         ("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("libtool" ,libtool)))
        ;; This driver is only supported on ARM systems.
@@ -3043,7 +3043,7 @@ X server.")
                 ("xorg-server" ,xorg-server)))
       (native-inputs
        `(("pkg-config" ,pkg-config)
-         ("autoconf" ,autoconf)
+         ("autoconf" ,autoconf-wrapper)
          ("automake" ,automake)
          ("libtool" ,libtool)))
       (supported-systems
@@ -5752,7 +5752,7 @@ The XCB util module provides the following libraries:
      (propagated-inputs
       `(("libxcb" ,libxcb)))
      (native-inputs
-      `(("autoconf" ,autoconf)
+      `(("autoconf" ,autoconf-wrapper)
         ("automake" ,automake)
         ("libtool" ,libtool)
         ("python" ,python-wrapper)
@@ -6249,7 +6249,7 @@ Conventions Manual) and some of the @dfn{EWMH}
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (inputs
      `(("libX11" ,libx11)
@@ -6622,7 +6622,7 @@ user set the transparency on a window.")
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("autoconf" ,autoconf)
+       ("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (synopsis "Resize fonts in the BDF format")
     (description
-- 
2.30.0


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 259 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [bug#46564] [PATCH core-updates]: Use autoconf-wrapper instead of autoconf
  2021-02-16 18:10 [bug#46564] [PATCH core-updates]: Use autoconf-wrapper instead of autoconf Maxime Devos
@ 2021-02-21 22:05 ` Ludovic Courtès
  2021-02-22 17:23   ` Maxime Devos
  0 siblings, 1 reply; 5+ messages in thread
From: Ludovic Courtès @ 2021-02-21 22:05 UTC (permalink / raw)
  To: Maxime Devos; +Cc: 46564

Hi,

Maxime Devos <maximedevos@telenet.be> skribis:

> This patch replaces autoconf with autoconf-wrapped in the native-inputs
> almost everywhere (except for some packages in
> gnu/packages/autotools.scm).  As this would cause many rebuilds, this
> patch targets the "core-updates" branch and not "master".

OK.

> A wine package has autoconf in the inputs instead of native-inputs,
> I wonder if that's intentional or a bug?  I left that package untouched
> for now.

I think that’s a bug.

> Why this change?
>
> * consistency / reducing confusion: some packages use autoconf, some use
>   autoconf-wrapper, and there's no (to me) obvious reason why two variants
>   of autoconf should be used.
>
> * <whatever pro's nckx had in mind on #guix>
>
> * some progress towards booting without /bin/sh
>
>   Scenario I have in mind (untested):
>
>   1. boot a system that doesn't have /bin/sh
>   2. decide to hack on guix (run git clone ...., cd $REPO)
>   3. guix environment guix
>   4. sh ./bootstrap (calls autoreconf -vfi)
>   5. ./configure --localstatedir=/var
>   6. more stuff
>
>   Without this patch, step (5.) will fail without this patch because
>   the generated ./configure script refers to /bin/sh, which doesn't
>   exist.
>
>   That said, there are some #!/bin/sh shebangs in the source code,
>   so there are some problems in (6.).

Yeah, I’m not sure this is a worthy goal.

> Why not?
>
> * ‘make dist’ will produce unusable tarballs
>   when in an environment from ‘guix environment PACKAGE’.
>   This should now be replaced with ‘guix environment PACKAGE --ad-hoc
>   autoconf'.

Yeah.  I would be in favor of unifying things the other way around:
using ‘autoconf’ instead of ‘autoconf-wrapper’ everywhere.  Since
there’s the ‘patch-shebangs’ phase, we don’t need ‘autoconf-wrapper’.

There’s one exception I think: Automake.  This one needs
‘autoconf-wrapper’ so it can actually run its test suite.  Perhaps
Libtool too.

WDYT?

Ludo’.




^ permalink raw reply	[flat|nested] 5+ messages in thread

* [bug#46564] [PATCH core-updates]: Use autoconf-wrapper instead of autoconf
  2021-02-21 22:05 ` Ludovic Courtès
@ 2021-02-22 17:23   ` Maxime Devos
  2021-02-23  8:19     ` Ludovic Courtès
  2021-02-23  8:19     ` Ludovic Courtès
  0 siblings, 2 replies; 5+ messages in thread
From: Maxime Devos @ 2021-02-22 17:23 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 46564


[-- Attachment #1.1: Type: text/plain, Size: 1658 bytes --]

Hi,

On Sun, 2021-02-21 at 23:05 +0100, Ludovic Courtès wrote:
> [...]
> 
> Maxime Devos <maximedevos@telenet.be> skribis:
> 
> > This patch replaces autoconf with autoconf-wrapped in the native-inputs
> > almost everywhere (except for some packages in
> > gnu/packages/autotools.scm).  As this would cause many rebuilds, this
> > patch targets the "core-updates" branch and not "master".
> 
> OK.

The revised patch targets master, as less packages were changed
(changing the definition of libuv should be done on core-updates).

> > A wine package has autoconf in the inputs instead of native-inputs,
> > I wonder if that's intentional or a bug?  I left that package untouched
> > for now.
> 
> I think that’s a bug.
> 
> > Why this change? [...]
> Yeah, I’m not sure this is a worthy goal.
> 
> > Why not?
> [...]
> Yeah.  I would be in favor of unifying things the other way around:
> using ‘autoconf’ instead of ‘autoconf-wrapper’ everywhere.  Since
> there’s the ‘patch-shebangs’ phase, we don’t need ‘autoconf-wrapper’.

I've attached a patch that unifies things the other way around.

> There’s one exception I think: Automake.  This one needs
> ‘autoconf-wrapper’ so it can actually run its test suite.  Perhaps
> Libtool too.

Some other packages fail to build without autoconf-wrapper as well.
Some packages run './configure' from 'autogen.sh' or from the Makefile.
I added a little explanation to each package that actually needs
autoconf-wrapper, and discouraged new uses of autoconf-wrapper with
a comment next to the definition of autoconf-wrapper.

WDYT?

Maxime.

[-- Attachment #1.2: 0001-gnu-Use-autoconf-instead-of-autoconf-wrapper-when-po.patch --]
[-- Type: text/x-patch, Size: 11940 bytes --]

From d42be9473bac6b8bcfe17a37c92f2481cb2198fb Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Mon, 22 Feb 2021 16:43:10 +0100
Subject: [PATCH] gnu: Use autoconf instead of autoconf-wrapper when possible.

This should reduce confusion on when to use the "autoconf"
package and when to use "autoconf-wrapper" instead in
package definitions.

Fixes: <https://issues.guix.gnu.org/46564>

* gnu/packages/autotools.scm (autoconf-wrapper):
  advise to use the "autoconf" package instead where
  possible.
* gnu/packages/game-development.scm (tsukundere)[native-inputs]:
  use "autoconf" instead of "autoconf-wrapper".
* gnu/packages/gimp.scm
  (glimpse)[native-inputs]: likewise.
  (gimp-resynthesizer)[native-inputs]: add comment on why
  "autoconf-wrapper" is used.
* gnu/packages/gnunet.scm (gnunet)[native-inputs]:
  use "autoconf" instead of "autoconf-wrapper".
* gnu/packages/gnupg.scm (signing-party)[native-inputs]:
  add comment on why "autoconf-wrapper" is used.
* gnu/packages/guile-xyz.scm
  (guile-bash,guile-filesystem,guile-ics,guile-udev)[native-inputs]:
  use "autoconf" instead of "autoconf-wrapper".
* gnu/packages/libevent.scm (libuv)[native-inputs]: indicates
  "autoconf-wrapper" needs to be replaced with "autoconf"
  on core-updates.
* gnu/packages/logging.scm (glog)[native-inputs]: use "autoconf"
  instead of "autoconf-wrapper".
* gnu/packages/mail.scm (libetpan)[native-inputs]: likewise.
* gnu/packages/mate.scm
  (mate-icon-theme-faenza)[native-inputs]: add comment on why
  "autoconf-wrapper" is used.
  (mate-screensaver)[native-inputs]: use "autoconf" instead of
  "autoconf-wrapper".
* gnu/packages/package-management.scm (guix)[native-inputs]: likewise.
* gnu/packages/sawfish.scm (librep)[native-inputs]: likewise.
* gnu/packages/video.scm (motion)[native-inputs]: likewise.
* gnu/packages/zile.scm (zile)[native-inputs]: likewise.
---
 gnu/packages/autotools.scm          | 2 ++
 gnu/packages/game-development.scm   | 2 +-
 gnu/packages/gimp.scm               | 4 +++-
 gnu/packages/gnunet.scm             | 2 +-
 gnu/packages/gnupg.scm              | 2 ++
 gnu/packages/guile-xyz.scm          | 8 ++++----
 gnu/packages/libevent.scm           | 1 +
 gnu/packages/logging.scm            | 2 +-
 gnu/packages/mail.scm               | 2 +-
 gnu/packages/mate.scm               | 4 +++-
 gnu/packages/package-management.scm | 2 +-
 gnu/packages/sawfish.scm            | 2 +-
 gnu/packages/video.scm              | 2 +-
 gnu/packages/zile.scm               | 2 +-
 14 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm
index 09f4bf4122..452749828a 100644
--- a/gnu/packages/autotools.scm
+++ b/gnu/packages/autotools.scm
@@ -267,6 +267,8 @@ exec ~a --no-auto-compile \"$0\" \"$@\"
     ;; Do not show it in the UI since it's meant for internal use.
     (properties '((hidden? . #t)))))
 
+;; Only use this package when autoconf is not usable,
+;; see <https://issues.guix.gnu.org/46564#1>.
 (define-public autoconf-wrapper
   (make-autoconf-wrapper autoconf))
 
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 92c3da92ab..18b4358887 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -529,7 +529,7 @@ clone.")
                    all)))
                #t))))))
     (native-inputs
-     `(("autoconf" ,autoconf-wrapper)
+     `(("autoconf" ,autoconf)
        ("automake" ,automake)
        ("guile" ,guile-3.0)
        ("pkg-config" ,pkg-config)
diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 4d229a1fd9..5e61091f22 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -518,6 +518,8 @@ MyPaint.")
                (mkdir-p target)
                #t))))))
     (native-inputs
+     ;; avoid ./autogen.sh: ./configure: /bin/sh: bad interpreter:
+     ;; No such file or directory
      `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("glib" ,glib "bin")                       ; glib-gettextize
@@ -590,7 +592,7 @@ transferring the style of an image.")
                    (format port "for dir in '~a'.split(':'):~%" pythonpath)
                    (format port "    site.addsitedir(dir)~%")))))))))
     (native-inputs
-     `(("autoconf" ,autoconf-wrapper)
+     `(("autoconf" ,autoconf)
        ("automake" ,automake)
        ("gtk-doc" ,gtk-doc)
        ("intltool" ,intltool)
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 80e4aba29b..d261f42dcc 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -368,7 +368,7 @@ kinds of basic applications for the foundation of a GNU internet.")
                   "0nqc18jh9j30y4l6yh6j35byfg6qalq7yr3frv9rk10qa041c2sv"))))
       (build-system gnu-build-system)
       (native-inputs `(("pkg-config" ,pkg-config)
-                       ("autoconf" ,autoconf-wrapper)
+                       ("autoconf" ,autoconf)
                        ("automake" ,automake)))
       (inputs `(("guile" ,guile-2.0)
                 ("gnunet" ,gnunet)))
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 18fc76ef35..20fc264659 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -695,6 +695,8 @@ PGP keysigning parties.")
                 "1aig5ssabzbk4mih7xd04vgr931bw0flbi8dz902wlr610gyv5s5"))))
     (build-system gnu-build-system)
     (native-inputs
+     ;; autoconf-wrapper is required due to the non-standard
+     ;; 'configure phase.
      `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)))
     (inputs `(("perl" ,perl)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 8d9126df44..c4c8a04b5c 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -367,7 +367,7 @@ dictionary and suggesting spelling corrections.")
                (string-append "--libdir=" (assoc-ref %outputs "out")
                               "/lib/bash"))))
       (native-inputs `(("pkg-config" ,pkg-config)
-                       ("autoconf" ,autoconf-wrapper)
+                       ("autoconf" ,autoconf)
                        ("automake" ,automake)
                        ("libtool" ,libtool)
                        ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'.
@@ -642,7 +642,7 @@ is not available for Guile 2.0.")
                 "1shmkc0y9r2sj3kw7hrsnamnp7y8xifkhf3m3rnfxczqg63k67vy"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf-wrapper)
+     `(("autoconf" ,autoconf)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)
        ("texinfo" ,texinfo)))
@@ -1697,7 +1697,7 @@ provides tight coupling to Guix.")
                   #t))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf-wrapper)
+     `(("autoconf" ,autoconf)
        ("automake" ,automake)
        ("texinfo" ,texinfo)
        ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'.
@@ -1830,7 +1830,7 @@ users and in some situations.")
                 "1l6csncjqnx58c6c3wdl7rshnhk4pzhjq2q8lnkg483564s9w5py"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf-wrapper)
+     `(("autoconf" ,autoconf)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)
        ("libtool" ,libtool)
diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm
index dab574a155..7109d9a88d 100644
--- a/gnu/packages/libevent.scm
+++ b/gnu/packages/libevent.scm
@@ -115,6 +115,7 @@ limited support for fork events.")
      '(#:configure-flags '("--disable-static")
        ;; XXX: Some tests want /dev/tty, attempt to make connections, etc.
        #:tests? #f))
+    ;; TODO replace with autoconf on core-updates
     (native-inputs `(("autoconf" ,autoconf-wrapper)
                      ("automake" ,automake)
                      ("libtool" ,libtool)
diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index 87283f3752..eafc23b2e6 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -99,7 +99,7 @@ staying as close to their API as is reasonable.")
                       #t)))))
     (native-inputs
      `(("perl" ,perl)                             ;for tests
-       ("autoconf" ,autoconf-wrapper)
+       ("autoconf" ,autoconf)
        ("automake" ,automake)
        ("libtool" ,libtool)))
     (synopsis "C++ logging library")
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 2bd376a1a1..bb021fad0d 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1474,7 +1474,7 @@ useful features.")
              (sha256
                (base32 "0g7an003simfdn7ihg9yjv7hl2czsmjsndjrp39i7cad8icixscn"))))
     (build-system gnu-build-system)
-    (native-inputs `(("autoconf" ,autoconf-wrapper)
+    (native-inputs `(("autoconf" ,autoconf)
                      ("automake" ,automake)
                      ("libtool" ,libtool)
                      ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index a9635d90fe..fbb1a74d09 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -176,6 +176,8 @@ actions.")
              (setenv "CONFIG_SHELL" (which "sh"))
              (invoke "sh" "autogen.sh"))))))
     (native-inputs
+     ;; autoconf-wrapper is required due to the non-standard
+     ;; 'autoconf phase.
      `(("autoconf" ,autoconf-wrapper)
        ("automake" ,automake)
        ("intltool" ,intltool)
@@ -1201,7 +1203,7 @@ Re-decorates windows on un-maximise.
                (("dbus-1") ""))))))))
     (native-inputs
      `(("automake" ,automake)
-       ("autoconf" ,autoconf-wrapper)
+       ("autoconf" ,autoconf)
        ("gettext" ,gettext-minimal)
        ("intltool" ,intltool)
        ("mate-common" ,mate-common)
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 9fb8c40a31..9e498fbe29 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -377,7 +377,7 @@ $(prefix)/etc/init.d\n")))
                        ;; XXX: Keep the development inputs here even though
                        ;; they're unnecessary, just so that 'guix environment
                        ;; guix' always contains them.
-                       ("autoconf" ,autoconf-wrapper)
+                       ("autoconf" ,autoconf)
                        ("automake" ,automake)
                        ("gettext" ,gettext-minimal)
                        ("texinfo" ,texinfo)
diff --git a/gnu/packages/sawfish.scm b/gnu/packages/sawfish.scm
index 26d8eba3b6..4162fe43cd 100644
--- a/gnu/packages/sawfish.scm
+++ b/gnu/packages/sawfish.scm
@@ -53,7 +53,7 @@
      `(("makeinfo"   ,texinfo)
        ("pkg-config" ,pkg-config)
 
-       ("autoconf" ,autoconf-wrapper)
+       ("autoconf" ,autoconf)
        ("automake" ,automake)
        ("libtool"  ,libtool)))
     (inputs
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 029b5b6ebb..b78874ae18 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -4244,7 +4244,7 @@ It counts more than 100 plugins.")
               (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf-wrapper)
+     `(("autoconf" ,autoconf)
        ("automake" ,automake)
        ("gettext" ,gettext-minimal)
        ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/zile.scm b/gnu/packages/zile.scm
index 6169815520..c28bc1bdd1 100644
--- a/gnu/packages/zile.scm
+++ b/gnu/packages/zile.scm
@@ -120,7 +120,7 @@ default Emacs configuration, but it carries a much lighter feature set.")
          ,@(package-inputs zile)))
       (native-inputs
        `(("m4" ,m4)                               ;for 'bootstrap'
-         ("autoconf" ,autoconf-wrapper)
+         ("autoconf" ,autoconf)
          ("automake" ,automake)
 
          ;; For some reason, 'bootstrap' insists on having these.
-- 
2.30.0


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [bug#46564] [PATCH core-updates]: Use autoconf-wrapper instead of autoconf
  2021-02-22 17:23   ` Maxime Devos
@ 2021-02-23  8:19     ` Ludovic Courtès
  2021-02-23  8:19     ` Ludovic Courtès
  1 sibling, 0 replies; 5+ messages in thread
From: Ludovic Courtès @ 2021-02-23  8:19 UTC (permalink / raw)
  To: Maxime Devos; +Cc: 46564

Hi Maxime,

Maxime Devos <maximedevos@telenet.be> skribis:

>> There’s one exception I think: Automake.  This one needs
>> ‘autoconf-wrapper’ so it can actually run its test suite.  Perhaps
>> Libtool too.
>
> Some other packages fail to build without autoconf-wrapper as well.
> Some packages run './configure' from 'autogen.sh' or from the Makefile.

Oh right.

> I added a little explanation to each package that actually needs
> autoconf-wrapper, and discouraged new uses of autoconf-wrapper with
> a comment next to the definition of autoconf-wrapper.

Great.

> From d42be9473bac6b8bcfe17a37c92f2481cb2198fb Mon Sep 17 00:00:00 2001
> From: Maxime Devos <maximedevos@telenet.be>
> Date: Mon, 22 Feb 2021 16:43:10 +0100
> Subject: [PATCH] gnu: Use autoconf instead of autoconf-wrapper when possible.
>
> This should reduce confusion on when to use the "autoconf"
> package and when to use "autoconf-wrapper" instead in
> package definitions.
>
> Fixes: <https://issues.guix.gnu.org/46564>
>
> * gnu/packages/autotools.scm (autoconf-wrapper):
>   advise to use the "autoconf" package instead where
>   possible.
> * gnu/packages/game-development.scm (tsukundere)[native-inputs]:
>   use "autoconf" instead of "autoconf-wrapper".
> * gnu/packages/gimp.scm
>   (glimpse)[native-inputs]: likewise.
>   (gimp-resynthesizer)[native-inputs]: add comment on why
>   "autoconf-wrapper" is used.
> * gnu/packages/gnunet.scm (gnunet)[native-inputs]:
>   use "autoconf" instead of "autoconf-wrapper".
> * gnu/packages/gnupg.scm (signing-party)[native-inputs]:
>   add comment on why "autoconf-wrapper" is used.
> * gnu/packages/guile-xyz.scm
>   (guile-bash,guile-filesystem,guile-ics,guile-udev)[native-inputs]:
>   use "autoconf" instead of "autoconf-wrapper".
> * gnu/packages/libevent.scm (libuv)[native-inputs]: indicates
>   "autoconf-wrapper" needs to be replaced with "autoconf"
>   on core-updates.
> * gnu/packages/logging.scm (glog)[native-inputs]: use "autoconf"
>   instead of "autoconf-wrapper".
> * gnu/packages/mail.scm (libetpan)[native-inputs]: likewise.
> * gnu/packages/mate.scm
>   (mate-icon-theme-faenza)[native-inputs]: add comment on why
>   "autoconf-wrapper" is used.
>   (mate-screensaver)[native-inputs]: use "autoconf" instead of
>   "autoconf-wrapper".
> * gnu/packages/package-management.scm (guix)[native-inputs]: likewise.
> * gnu/packages/sawfish.scm (librep)[native-inputs]: likewise.
> * gnu/packages/video.scm (motion)[native-inputs]: likewise.
> * gnu/packages/zile.scm (zile)[native-inputs]: likewise.

At first sight it should rebuild much so LGTM!

Thanks,
Ludo’.




^ permalink raw reply	[flat|nested] 5+ messages in thread

* [bug#46564] [PATCH core-updates]: Use autoconf-wrapper instead of autoconf
  2021-02-22 17:23   ` Maxime Devos
  2021-02-23  8:19     ` Ludovic Courtès
@ 2021-02-23  8:19     ` Ludovic Courtès
  1 sibling, 0 replies; 5+ messages in thread
From: Ludovic Courtès @ 2021-02-23  8:19 UTC (permalink / raw)
  To: Maxime Devos; +Cc: 46564

Ah, I meant “it should _not_ rebuild much”, so OK for master.




^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-02-23  8:22 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-16 18:10 [bug#46564] [PATCH core-updates]: Use autoconf-wrapper instead of autoconf Maxime Devos
2021-02-21 22:05 ` Ludovic Courtès
2021-02-22 17:23   ` Maxime Devos
2021-02-23  8:19     ` Ludovic Courtès
2021-02-23  8:19     ` Ludovic Courtès

unofficial mirror of guix-patches@gnu.org 

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://yhetil.org/guix-patches/1 guix-patches/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 guix-patches guix-patches/ https://yhetil.org/guix-patches \
		guix-patches@gnu.org
	public-inbox-index guix-patches

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://news.yhetil.org/yhetil.gnu.guix.patches


AGPL code for this site: git clone http://ou63pmih66umazou.onion/public-inbox.git