diff options
| author | Brian Behlendorf <[email protected]> | 2021-01-02 16:55:55 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-01-02 16:55:55 -0800 |
| commit | 06346cc5b50bef7327f7c901b92cbadab7fd7265 (patch) | |
| tree | d18e50babb1779061d8df8f507e5b87aa17b1600 /config/user-makedev.m4 | |
| parent | 4ba8c6b584dc23b2f2e11682ff06ed664f41107e (diff) | |
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 <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Issue #11413
Closes #11419
Diffstat (limited to 'config/user-makedev.m4')
| -rw-r--r-- | config/user-makedev.m4 | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/config/user-makedev.m4 b/config/user-makedev.m4 index 4383681a8..8986107ae 100644 --- a/config/user-makedev.m4 +++ b/config/user-makedev.m4 @@ -3,13 +3,12 @@ dnl # glibc 2.25 dnl # AC_DEFUN([ZFS_AC_CONFIG_USER_MAKEDEV_IN_SYSMACROS], [ AC_MSG_CHECKING([makedev() is declared in sys/sysmacros.h]) - AC_TRY_COMPILE( - [ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <sys/sysmacros.h> - ],[ + ]], [[ int k; k = makedev(0,0); - ],[ + ]])],[ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_MAKEDEV_IN_SYSMACROS, 1, [makedev() is declared in sys/sysmacros.h]) @@ -23,13 +22,12 @@ dnl # glibc X < Y < 2.25 dnl # AC_DEFUN([ZFS_AC_CONFIG_USER_MAKEDEV_IN_MKDEV], [ AC_MSG_CHECKING([makedev() is declared in sys/mkdev.h]) - AC_TRY_COMPILE( - [ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <sys/mkdev.h> - ],[ + ]], [[ int k; k = makedev(0,0); - ],[ + ]])],[ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_MAKEDEV_IN_MKDEV, 1, [makedev() is declared in sys/mkdev.h]) |