me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Ludovic Courtès 2020-12-11 16:24:53 +01:00
parent edc2acb779
commit dbdae9f96f
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config-daemon.ac
View File

@ -13,7 +13,7 @@ if test "x$guix_build_daemon" = "xyes"; then
GUIX_ASSERT_CXX11 GUIX_ASSERT_CXX11
AC_PROG_RANLIB 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. dnl Use 64-bit file system calls so that we can support files > 2 GiB.
AC_SYS_LARGEFILE AC_SYS_LARGEFILE

12
configure.ac
View File

@ -1,7 +1,7 @@
# -*- Autoconf -*- # -*- Autoconf -*-
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ(2.68) AC_PREREQ([2.69])
AC_INIT([GNU Guix], AC_INIT([GNU Guix],
[m4_esyscmd([build-aux/git-version-gen .tarball-version])], [m4_esyscmd([build-aux/git-version-gen .tarball-version])],
[bug-guix@gnu.org], [guix], [bug-guix@gnu.org], [guix],
@ -29,35 +29,35 @@ GUIX_ASSERT_SUPPORTED_SYSTEM
AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = "xyes"]) AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = "xyes"])
AC_ARG_WITH(store-dir, 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)]), [file name of the store (defaults to /gnu/store)]),
[storedir="$withval"], [storedir="$withval"],
[storedir="/gnu/store"]) [storedir="/gnu/store"])
AC_SUBST(storedir) AC_SUBST(storedir)
AC_ARG_WITH([bash-completion-dir], 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]), [name of the Bash completion directory]),
[bashcompletiondir="$withval"], [bashcompletiondir="$withval"],
[bashcompletiondir='${sysconfdir}/bash_completion.d']) [bashcompletiondir='${sysconfdir}/bash_completion.d'])
AC_SUBST([bashcompletiondir]) AC_SUBST([bashcompletiondir])
AC_ARG_WITH([zsh-completion-dir], 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]), [name of the Zsh completion directory]),
[zshcompletiondir="$withval"], [zshcompletiondir="$withval"],
[zshcompletiondir='${datadir}/zsh/site-functions']) [zshcompletiondir='${datadir}/zsh/site-functions'])
AC_SUBST([zshcompletiondir]) AC_SUBST([zshcompletiondir])
AC_ARG_WITH([fish-completion-dir], 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]), [name of the Fish completion directory]),
[fishcompletiondir="$withval"], [fishcompletiondir="$withval"],
[fishcompletiondir='${datadir}/fish/vendor_completions.d']) [fishcompletiondir='${datadir}/fish/vendor_completions.d'])
AC_SUBST([fishcompletiondir]) AC_SUBST([fishcompletiondir])
AC_ARG_WITH([selinux-policy-dir], 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]), [name of the SELinux policy directory]),
[selinux_policydir="$withval"], [selinux_policydir="$withval"],
[selinux_policydir='${datadir}/selinux/']) [selinux_policydir='${datadir}/selinux/'])

4
m4/guix.m4
View File

@ -26,7 +26,7 @@ AC_DEFUN([GUIX_SYSTEM_TYPE], [
AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AC_CANONICAL_HOST])
AC_PATH_PROG([SED], [sed]) 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').]), [Platform identifier (e.g., `i686-linux').]),
[guix_system="$withval"], [guix_system="$withval"],
[case "$host_cpu" in [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_DEFUN([GUIX_ASSERT_SUPPORTED_SYSTEM], [
AC_REQUIRE([GUIX_SYSTEM_TYPE]) 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 [Assert that even if this platform is unsupported, you will be
courageous and port the GNU System distribution to it (see courageous and port the GNU System distribution to it (see
"GNU Distribution" in the manual.)])], "GNU Distribution" in the manual.)])],