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/kernel.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/kernel.m4')
| -rw-r--r-- | config/kernel.m4 | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/config/kernel.m4 b/config/kernel.m4 index bd14dd416..f31be845f 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -322,19 +322,15 @@ AC_DEFUN([ZFS_AC_KERNEL], [ utsrelease2=$kernelbuild/include/linux/utsrelease.h utsrelease3=$kernelbuild/include/generated/utsrelease.h AS_IF([test -r $utsrelease1 && fgrep -q UTS_RELEASE $utsrelease1], [ - utsrelease=linux/version.h + utsrelease=$utsrelease1 ], [test -r $utsrelease2 && fgrep -q UTS_RELEASE $utsrelease2], [ - utsrelease=linux/utsrelease.h + utsrelease=$utsrelease2 ], [test -r $utsrelease3 && fgrep -q UTS_RELEASE $utsrelease3], [ - utsrelease=generated/utsrelease.h + utsrelease=$utsrelease3 ]) - AS_IF([test "$utsrelease"], [ - kernsrcver=`(echo "#include <$utsrelease>"; - echo "kernsrcver=UTS_RELEASE") | - ${CPP} -I $kernelbuild/include - | - grep "^kernsrcver=" | cut -d \" -f 2` - + AS_IF([test -n "$utsrelease"], [ + kernsrcver=$($AWK '/UTS_RELEASE/ { gsub(/"/, "", $[3]); print $[3] }' $utsrelease) AS_IF([test -z "$kernsrcver"], [ AC_MSG_RESULT([Not found]) AC_MSG_ERROR([ |