1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
From 03cca78d24d716eec792f86f5b0bc69886fad981 Mon Sep 17 00:00:00 2001
From: Patrick McCarty <patrick.mccarty@intel.com>
Date: Fri, 18 Dec 2020 01:54:05 +0000
Subject: [PATCH] configure.ac: fix compatibility with autoconf 2.70
With autoconf 2.70, not quoting the second argument to one of the AS_IF
macro expansions leads to generation of invalid shell code affecting the
first nested ERROR_IF_NO_PROG expansion.
The invalid shell code leads to an error resembling:
./configure: line 18826: syntax error near unexpected token `newline'
./configure: line 18826: ` '''
Fix the issue by quoting the second argument to the affected AS_IF,
similar to the quoting found elsewhere in configure.ac.
Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
Upstream-Status: Backport
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: tpm2-tss-3.0.3/configure.ac
===================================================================
--- tpm2-tss-3.0.3.orig/configure.ac
+++ tpm2-tss-3.0.3/configure.ac
@@ -279,7 +279,7 @@ AC_ARG_ENABLE([integration],
[build and execute integration tests])],,
[enable_integration=no])
AS_IF([test "x$enable_integration" = "xyes"],
- AS_IF([test "$HOSTOS" = "Linux"],
+ [AS_IF([test "$HOSTOS" = "Linux"],
[ERROR_IF_NO_PROG([ss])],
[ERROR_IF_NO_PROG([sockstat])])
ERROR_IF_NO_PROG([echo])
@@ -328,7 +328,7 @@ AS_IF([test "x$enable_integration" = "xy
[AC_MSG_ERROR([No simulator executable found in PATH for testing TCTI.])])
AC_SUBST([INTEGRATION_TCTI], [$integration_tcti])
AC_SUBST([INTEGRATION_ARGS], [$integration_args])
- AC_SUBST([ENABLE_INTEGRATION], [$enable_integration]))
+ AC_SUBST([ENABLE_INTEGRATION], [$enable_integration])])
AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"])
#
# sanitizer compiler flags
|
