diff options
author | Ned Bass <[email protected]> | 2014-12-15 13:53:00 -0800 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2015-01-06 16:53:30 -0800 |
commit | 4e30e68cafdd558463be2352849e707bcc36aa3c (patch) | |
tree | 802f63f858f238d1a8b931b0e8a949d995398f87 | |
parent | 49ee64e5e6ec7240bc63d96064f2feeb8f84ed9d (diff) |
Don't use AC_LANG_SOURCE for conftest.h source
Using AC_LANG_SOURCE with some versions of autoconf is problematic if
the given source is to be written to a header file. Such versions assume
the contents are to be written to conftest.c and generate shell code to
that effect. The contents of the test program to detect support for
Linux tracepoints were consequently malformed (containing the source for
conftest.h) so the build system incorrectly disabled tracepoints
support. Fix this in ZFS_LINUX_TRY_COMPILE_HEADER by passing the header
source directly to ZFS_LINUX_COMPILE_IFELSE.
Signed-off-by: Ned Bass <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Issue #2953
-rw-r--r-- | config/kernel.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/kernel.m4 b/config/kernel.m4 index d8784c9db..bdfb19c83 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -649,5 +649,5 @@ AC_DEFUN([ZFS_LINUX_TRY_COMPILE_HEADER], [AC_LANG_SOURCE([ZFS_LANG_PROGRAM([[$1]], [[$2]])])], [modules], [test -s build/conftest.o], - [$3], [$4], [AC_LANG_SOURCE([$5])]) + [$3], [$4], [$5]) ]) |