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