Autoconf 2.70 compatibility

Several m4 macros have been retired in autoconf 2.70.  Update the
the build system to use the new macros provided to replace them.

* Replaced AC_HELP_STRING with AS_HELP_STRING.

* Replaced AC_TRY_COMPILE with AC_COMPILE_IFELSE/AC_LANG_PROGRAM.

* Replaced AC_CANONICAL_SYSTEM with AC_CANONICAL_TARGET

* Replaced AC_PROG_LIBTOOL with LT_INIT

* $CPP is not defined in ZFS_AC_KERNEL and really shouldn't be
  directly used like this.  Replace it with an $AWK command
  to extract the kernel source version.

Reviewed-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #11413 
Closes #11419
This commit is contained in:
Brian Behlendorf 2021-01-02 16:55:55 -08:00 committed by GitHub
parent 4ba8c6b584
commit 06346cc5b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 27 additions and 33 deletions

View File

@ -7,7 +7,7 @@ dnl # set the PYTHON environment variable accordingly.
dnl # dnl #
AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_PYTHON], [ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_PYTHON], [
AC_ARG_WITH([python], AC_ARG_WITH([python],
AC_HELP_STRING([--with-python[=VERSION]], AS_HELP_STRING([--with-python[=VERSION]],
[default system python version @<:@default=check@:>@]), [default system python version @<:@default=check@:>@]),
[with_python=$withval], [with_python=$withval],
[with_python=check]) [with_python=check])

View File

@ -22,7 +22,7 @@ dnl # Determines if pyzfs can be built, requires Python 2.7 or later.
dnl # dnl #
AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_PYZFS], [ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_PYZFS], [
AC_ARG_ENABLE([pyzfs], AC_ARG_ENABLE([pyzfs],
AC_HELP_STRING([--enable-pyzfs], AS_HELP_STRING([--enable-pyzfs],
[install libzfs_core python bindings @<:@default=check@:>@]), [install libzfs_core python bindings @<:@default=check@:>@]),
[enable_pyzfs=$enableval], [enable_pyzfs=$enableval],
[enable_pyzfs=check]) [enable_pyzfs=check])

View File

@ -322,19 +322,15 @@ AC_DEFUN([ZFS_AC_KERNEL], [
utsrelease2=$kernelbuild/include/linux/utsrelease.h utsrelease2=$kernelbuild/include/linux/utsrelease.h
utsrelease3=$kernelbuild/include/generated/utsrelease.h utsrelease3=$kernelbuild/include/generated/utsrelease.h
AS_IF([test -r $utsrelease1 && fgrep -q UTS_RELEASE $utsrelease1], [ AS_IF([test -r $utsrelease1 && fgrep -q UTS_RELEASE $utsrelease1], [
utsrelease=linux/version.h utsrelease=$utsrelease1
], [test -r $utsrelease2 && fgrep -q UTS_RELEASE $utsrelease2], [ ], [test -r $utsrelease2 && fgrep -q UTS_RELEASE $utsrelease2], [
utsrelease=linux/utsrelease.h utsrelease=$utsrelease2
], [test -r $utsrelease3 && fgrep -q UTS_RELEASE $utsrelease3], [ ], [test -r $utsrelease3 && fgrep -q UTS_RELEASE $utsrelease3], [
utsrelease=generated/utsrelease.h utsrelease=$utsrelease3
]) ])
AS_IF([test "$utsrelease"], [ AS_IF([test -n "$utsrelease"], [
kernsrcver=`(echo "#include <$utsrelease>"; kernsrcver=$($AWK '/UTS_RELEASE/ { gsub(/"/, "", $[3]); print $[3] }' $utsrelease)
echo "kernsrcver=UTS_RELEASE") |
${CPP} -I $kernelbuild/include - |
grep "^kernsrcver=" | cut -d \" -f 2`
AS_IF([test -z "$kernsrcver"], [ AS_IF([test -z "$kernsrcver"], [
AC_MSG_RESULT([Not found]) AC_MSG_RESULT([Not found])
AC_MSG_ERROR([ AC_MSG_ERROR([

View File

@ -1,6 +1,6 @@
AC_DEFUN([ZFS_AC_CONFIG_USER_MOUNT_HELPER], [ AC_DEFUN([ZFS_AC_CONFIG_USER_MOUNT_HELPER], [
AC_ARG_WITH(mounthelperdir, AC_ARG_WITH(mounthelperdir,
AC_HELP_STRING([--with-mounthelperdir=DIR], AS_HELP_STRING([--with-mounthelperdir=DIR],
[install mount.zfs in dir [[/sbin]]]), [install mount.zfs in dir [[/sbin]]]),
mounthelperdir=$withval,mounthelperdir=/sbin) mounthelperdir=$withval,mounthelperdir=/sbin)

View File

@ -1,7 +1,7 @@
AC_DEFUN([ZFS_AC_CONFIG_USER_DRACUT], [ AC_DEFUN([ZFS_AC_CONFIG_USER_DRACUT], [
AC_MSG_CHECKING(for dracut directory) AC_MSG_CHECKING(for dracut directory)
AC_ARG_WITH([dracutdir], AC_ARG_WITH([dracutdir],
AC_HELP_STRING([--with-dracutdir=DIR], AS_HELP_STRING([--with-dracutdir=DIR],
[install dracut helpers @<:@default=check@:>@]), [install dracut helpers @<:@default=check@:>@]),
[dracutdir=$withval], [dracutdir=$withval],
[dracutdir=check]) [dracutdir=check])

View File

@ -1,6 +1,6 @@
AC_DEFUN([ZFS_AC_CONFIG_USER_ZFSEXEC], [ AC_DEFUN([ZFS_AC_CONFIG_USER_ZFSEXEC], [
AC_ARG_WITH(zfsexecdir, AC_ARG_WITH(zfsexecdir,
AC_HELP_STRING([--with-zfsexecdir=DIR], AS_HELP_STRING([--with-zfsexecdir=DIR],
[install scripts [[@<:@libexecdir@:>@/zfs]]]), [install scripts [[@<:@libexecdir@:>@/zfs]]]),
[zfsexecdir=$withval], [zfsexecdir=$withval],
[zfsexecdir="${libexecdir}/zfs"]) [zfsexecdir="${libexecdir}/zfs"])

View File

@ -3,13 +3,12 @@ dnl # glibc 2.25
dnl # dnl #
AC_DEFUN([ZFS_AC_CONFIG_USER_MAKEDEV_IN_SYSMACROS], [ AC_DEFUN([ZFS_AC_CONFIG_USER_MAKEDEV_IN_SYSMACROS], [
AC_MSG_CHECKING([makedev() is declared in sys/sysmacros.h]) AC_MSG_CHECKING([makedev() is declared in sys/sysmacros.h])
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
[
#include <sys/sysmacros.h> #include <sys/sysmacros.h>
],[ ]], [[
int k; int k;
k = makedev(0,0); k = makedev(0,0);
],[ ]])],[
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_MAKEDEV_IN_SYSMACROS, 1, AC_DEFINE(HAVE_MAKEDEV_IN_SYSMACROS, 1,
[makedev() is declared in sys/sysmacros.h]) [makedev() is declared in sys/sysmacros.h])
@ -23,13 +22,12 @@ dnl # glibc X < Y < 2.25
dnl # dnl #
AC_DEFUN([ZFS_AC_CONFIG_USER_MAKEDEV_IN_MKDEV], [ AC_DEFUN([ZFS_AC_CONFIG_USER_MAKEDEV_IN_MKDEV], [
AC_MSG_CHECKING([makedev() is declared in sys/mkdev.h]) AC_MSG_CHECKING([makedev() is declared in sys/mkdev.h])
AC_TRY_COMPILE( AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
[
#include <sys/mkdev.h> #include <sys/mkdev.h>
],[ ]], [[
int k; int k;
k = makedev(0,0); k = makedev(0,0);
],[ ]])],[
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_MAKEDEV_IN_MKDEV, 1, AC_DEFINE(HAVE_MAKEDEV_IN_MKDEV, 1,
[makedev() is declared in sys/mkdev.h]) [makedev() is declared in sys/mkdev.h])

View File

@ -1,27 +1,27 @@
AC_DEFUN([ZFS_AC_CONFIG_USER_SYSTEMD], [ AC_DEFUN([ZFS_AC_CONFIG_USER_SYSTEMD], [
AC_ARG_ENABLE(systemd, AC_ARG_ENABLE(systemd,
AC_HELP_STRING([--enable-systemd], AS_HELP_STRING([--enable-systemd],
[install systemd unit/preset files [[default: yes]]]), [install systemd unit/preset files [[default: yes]]]),
[enable_systemd=$enableval], [enable_systemd=$enableval],
[enable_systemd=check]) [enable_systemd=check])
AC_ARG_WITH(systemdunitdir, AC_ARG_WITH(systemdunitdir,
AC_HELP_STRING([--with-systemdunitdir=DIR], AS_HELP_STRING([--with-systemdunitdir=DIR],
[install systemd unit files in dir [[/usr/lib/systemd/system]]]), [install systemd unit files in dir [[/usr/lib/systemd/system]]]),
systemdunitdir=$withval,systemdunitdir=/usr/lib/systemd/system) systemdunitdir=$withval,systemdunitdir=/usr/lib/systemd/system)
AC_ARG_WITH(systemdpresetdir, AC_ARG_WITH(systemdpresetdir,
AC_HELP_STRING([--with-systemdpresetdir=DIR], AS_HELP_STRING([--with-systemdpresetdir=DIR],
[install systemd preset files in dir [[/usr/lib/systemd/system-preset]]]), [install systemd preset files in dir [[/usr/lib/systemd/system-preset]]]),
systemdpresetdir=$withval,systemdpresetdir=/usr/lib/systemd/system-preset) systemdpresetdir=$withval,systemdpresetdir=/usr/lib/systemd/system-preset)
AC_ARG_WITH(systemdmodulesloaddir, AC_ARG_WITH(systemdmodulesloaddir,
AC_HELP_STRING([--with-systemdmodulesloaddir=DIR], AS_HELP_STRING([--with-systemdmodulesloaddir=DIR],
[install systemd module load files into dir [[/usr/lib/modules-load.d]]]), [install systemd module load files into dir [[/usr/lib/modules-load.d]]]),
systemdmodulesloaddir=$withval,systemdmodulesloaddir=/usr/lib/modules-load.d) systemdmodulesloaddir=$withval,systemdmodulesloaddir=/usr/lib/modules-load.d)
AC_ARG_WITH(systemdgeneratordir, AC_ARG_WITH(systemdgeneratordir,
AC_HELP_STRING([--with-systemdgeneratordir=DIR], AS_HELP_STRING([--with-systemdgeneratordir=DIR],
[install systemd generators in dir [[/usr/lib/systemd/system-generators]]]), [install systemd generators in dir [[/usr/lib/systemd/system-generators]]]),
systemdgeneratordir=$withval,systemdgeneratordir=/usr/lib/systemd/system-generators) systemdgeneratordir=$withval,systemdgeneratordir=/usr/lib/systemd/system-generators)

View File

@ -1,6 +1,6 @@
AC_DEFUN([ZFS_AC_CONFIG_USER_SYSVINIT], [ AC_DEFUN([ZFS_AC_CONFIG_USER_SYSVINIT], [
AC_ARG_ENABLE(sysvinit, AC_ARG_ENABLE(sysvinit,
AC_HELP_STRING([--enable-sysvinit], AS_HELP_STRING([--enable-sysvinit],
[install SysV init scripts [default: yes]]), [install SysV init scripts [default: yes]]),
[],enable_sysvinit=yes) [],enable_sysvinit=yes)

View File

@ -1,7 +1,7 @@
AC_DEFUN([ZFS_AC_CONFIG_USER_UDEV], [ AC_DEFUN([ZFS_AC_CONFIG_USER_UDEV], [
AC_MSG_CHECKING(for udev directories) AC_MSG_CHECKING(for udev directories)
AC_ARG_WITH(udevdir, AC_ARG_WITH(udevdir,
AC_HELP_STRING([--with-udevdir=DIR], AS_HELP_STRING([--with-udevdir=DIR],
[install udev helpers @<:@default=check@:>@]), [install udev helpers @<:@default=check@:>@]),
[udevdir=$withval], [udevdir=$withval],
[udevdir=check]) [udevdir=check])
@ -18,7 +18,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_UDEV], [
]) ])
AC_ARG_WITH(udevruledir, AC_ARG_WITH(udevruledir,
AC_HELP_STRING([--with-udevruledir=DIR], AS_HELP_STRING([--with-udevruledir=DIR],
[install udev rules [[UDEVDIR/rules.d]]]), [install udev rules [[UDEVDIR/rules.d]]]),
[udevruledir=$withval], [udevruledir=$withval],
[udevruledir="${udevdir}/rules.d"]) [udevruledir="${udevdir}/rules.d"])

View File

@ -180,7 +180,7 @@ AC_DEFUN([ZFS_AC_CONFIG], [
[Config file 'kernel|user|all|srpm']), [Config file 'kernel|user|all|srpm']),
[ZFS_CONFIG="$withval"]) [ZFS_CONFIG="$withval"])
AC_ARG_ENABLE([linux-builtin], AC_ARG_ENABLE([linux-builtin],
[AC_HELP_STRING([--enable-linux-builtin], [AS_HELP_STRING([--enable-linux-builtin],
[Configure for builtin in-tree kernel modules @<:@default=no@:>@])], [Configure for builtin in-tree kernel modules @<:@default=no@:>@])],
[], [],
[enable_linux_builtin=no]) [enable_linux_builtin=no])

View File

@ -36,7 +36,7 @@ AC_LANG(C)
ZFS_AC_META ZFS_AC_META
AC_CONFIG_AUX_DIR([config]) AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([config]) AC_CONFIG_MACRO_DIR([config])
AC_CANONICAL_SYSTEM AC_CANONICAL_TARGET
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_INIT_AUTOMAKE([subdir-objects]) AM_INIT_AUTOMAKE([subdir-objects])
@ -45,9 +45,9 @@ AC_CONFIG_HEADERS([zfs_config.h], [
awk -f ${ac_srcdir}/config/config.awk zfs_config.h.tmp >zfs_config.h && awk -f ${ac_srcdir}/config/config.awk zfs_config.h.tmp >zfs_config.h &&
rm zfs_config.h.tmp) || exit 1]) rm zfs_config.h.tmp) || exit 1])
LT_INIT
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_CC AC_PROG_CC
AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
AM_PROG_AS AM_PROG_AS
AM_PROG_CC_C_O AM_PROG_CC_C_O