aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-12-11 16:24:53 +0100
committerLudovic Courtès <ludo@gnu.org>2020-12-11 19:06:53 +0100
commitdbdae9f96f11a006993b659e0e7fd5cbf467f844 (patch)
treec8614477a6d6d41c4e7dba4f521ef454da27c7a2
parentedc2acb7796a9f1c6d3a6caea54bad3a17cd988b (diff)
downloadguix-dbdae9f96f11a006993b659e0e7fd5cbf467f844.tar
guix-dbdae9f96f11a006993b659e0e7fd5cbf467f844.tar.gz
maint: Avoid macros obsolete in Autoconf 2.70.
* configure.ac: Require Autoconf 2.69. Use 'AS_HELP_STRING' instead of 'AC_HELP_STRING'. * m4/guix.m4: Likewise. * config-daemon.ac: Use 'AC_CONFIG_HEADERS' instead of the singular variant.
-rw-r--r--config-daemon.ac2
-rw-r--r--configure.ac12
-rw-r--r--m4/guix.m44
3 files changed, 9 insertions, 9 deletions
diff --git a/config-daemon.ac b/config-daemon.ac
index 50ead355a8..19958d331b 100644
--- a/config-daemon.ac
+++ b/config-daemon.ac
@@ -13,7 +13,7 @@ if test "x$guix_build_daemon" = "xyes"; then
GUIX_ASSERT_CXX11
AC_PROG_RANLIB
- AC_CONFIG_HEADER([nix/config.h])
+ AC_CONFIG_HEADERS([nix/config.h])
dnl Use 64-bit file system calls so that we can support files > 2 GiB.
AC_SYS_LARGEFILE
diff --git a/configure.ac b/configure.ac
index 942e84164a..a5bdf24e93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.68)
+AC_PREREQ([2.69])
AC_INIT([GNU Guix],
[m4_esyscmd([build-aux/git-version-gen .tarball-version])],
[bug-guix@gnu.org], [guix],
@@ -29,35 +29,35 @@ GUIX_ASSERT_SUPPORTED_SYSTEM
AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = "xyes"])
AC_ARG_WITH(store-dir,
- AC_HELP_STRING([--with-store-dir=PATH],
+ AS_HELP_STRING([--with-store-dir=PATH],
[file name of the store (defaults to /gnu/store)]),
[storedir="$withval"],
[storedir="/gnu/store"])
AC_SUBST(storedir)
AC_ARG_WITH([bash-completion-dir],
- AC_HELP_STRING([--with-bash-completion-dir=DIR],
+ AS_HELP_STRING([--with-bash-completion-dir=DIR],
[name of the Bash completion directory]),
[bashcompletiondir="$withval"],
[bashcompletiondir='${sysconfdir}/bash_completion.d'])
AC_SUBST([bashcompletiondir])
AC_ARG_WITH([zsh-completion-dir],
- AC_HELP_STRING([--with-zsh-completion-dir=DIR],
+ AS_HELP_STRING([--with-zsh-completion-dir=DIR],
[name of the Zsh completion directory]),
[zshcompletiondir="$withval"],
[zshcompletiondir='${datadir}/zsh/site-functions'])
AC_SUBST([zshcompletiondir])
AC_ARG_WITH([fish-completion-dir],
- AC_HELP_STRING([--with-fish-completion-dir=DIR],
+ AS_HELP_STRING([--with-fish-completion-dir=DIR],
[name of the Fish completion directory]),
[fishcompletiondir="$withval"],
[fishcompletiondir='${datadir}/fish/vendor_completions.d'])
AC_SUBST([fishcompletiondir])
AC_ARG_WITH([selinux-policy-dir],
- AC_HELP_STRING([--with-selinux-policy-dir=DIR],
+ AS_HELP_STRING([--with-selinux-policy-dir=DIR],
[name of the SELinux policy directory]),
[selinux_policydir="$withval"],
[selinux_policydir='${datadir}/selinux/'])
diff --git a/m4/guix.m4 b/m4/guix.m4
index 4fa7cdf737..f8eb5aaf51 100644
--- a/m4/guix.m4
+++ b/m4/guix.m4
@@ -26,7 +26,7 @@ AC_DEFUN([GUIX_SYSTEM_TYPE], [
AC_REQUIRE([AC_CANONICAL_HOST])
AC_PATH_PROG([SED], [sed])
- AC_ARG_WITH(system, AC_HELP_STRING([--with-system=SYSTEM],
+ AC_ARG_WITH(system, AS_HELP_STRING([--with-system=SYSTEM],
[Platform identifier (e.g., `i686-linux').]),
[guix_system="$withval"],
[case "$host_cpu" in
@@ -78,7 +78,7 @@ dnl Assert that this is a system to which the distro is ported.
AC_DEFUN([GUIX_ASSERT_SUPPORTED_SYSTEM], [
AC_REQUIRE([GUIX_SYSTEM_TYPE])
- AC_ARG_WITH([courage], [AC_HELP_STRING([--with-courage],
+ AC_ARG_WITH([courage], [AS_HELP_STRING([--with-courage],
[Assert that even if this platform is unsupported, you will be
courageous and port the GNU System distribution to it (see
"GNU Distribution" in the manual.)])],