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
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
|
https://github.com/mchehab/rasdaemon/pull/81
From 9632f63c3855b119ab4b02300e27ab357bddcf03 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Thu, 29 Dec 2022 17:23:47 +0000
Subject: [PATCH] configure.ac: fix bashisms
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
configure scripts need to be runnable with a POSIX-compliant /bin/sh.
On many (but not all!) systems, /bin/sh is provided by Bash, so errors
like this aren't spotted. Notably Debian defaults to /bin/sh provided
by dash which doesn't tolerate such bashisms as '=='.
This retains compatibility with bash.
Signed-off-by: Sam James <sam@gentoo.org>
--- a/configure.ac
+++ b/configure.ac
@@ -27,14 +27,14 @@ AC_ARG_ENABLE([all],
AC_ARG_ENABLE([sqlite3],
AS_HELP_STRING([--enable-sqlite3], [enable storing data at SQL lite database (currently experimental)]))
-AS_IF([test "x$enable_sqlite3" = "xyes" || test "x$enable_all" == "xyes"], [
+AS_IF([test "x$enable_sqlite3" = "xyes" || test "x$enable_all" = "xyes"], [
AC_CHECK_LIB(sqlite3, sqlite3_open,[echo "found sqlite3"] , AC_MSG_ERROR([*** Unable to find sqlite3 library]), )
SQLITE3_LIBS="-lsqlite3"
AC_DEFINE(HAVE_SQLITE3,1,"have sqlite3")
AC_SUBST([WITH_SQLITE3])
])
-AM_CONDITIONAL([WITH_SQLITE3], [test x$enable_sqlite3 = xyes || test x$enable_all == xyes])
+AM_CONDITIONAL([WITH_SQLITE3], [test x$enable_sqlite3 = xyes || test x$enable_all = xyes])
AM_COND_IF([WITH_SQLITE3], [USE_SQLITE3="yes"], [USE_SQLITE3="no"])
AC_SUBST([SQLITE3_LIBS])
@@ -43,122 +43,122 @@ AC_SUBST([SQLITE3_LIBS])
AC_ARG_ENABLE([aer],
AS_HELP_STRING([--enable-aer], [enable PCIe AER events (currently experimental)]))
-AS_IF([test "x$enable_aer" = "xyes" || test "x$enable_all" == "xyes"], [
+AS_IF([test "x$enable_aer" = "xyes" || test "x$enable_all" = "xyes"], [
AC_DEFINE(HAVE_AER,1,"have PCIe AER events collect")
AC_SUBST([WITH_AER])
])
-AM_CONDITIONAL([WITH_AER], [test x$enable_aer = xyes || test x$enable_all == xyes])
+AM_CONDITIONAL([WITH_AER], [test x$enable_aer = xyes || test x$enable_all = xyes])
AM_COND_IF([WITH_AER], [USE_AER="yes"], [USE_AER="no"])
AC_ARG_ENABLE([non_standard],
AS_HELP_STRING([--enable-non-standard], [enable NON_STANDARD events (currently experimental)]))
-AS_IF([test "x$enable_non_standard" = "xyes" || test "x$enable_all" == "xyes"], [
+AS_IF([test "x$enable_non_standard" = "xyes" || test "x$enable_all" = "xyes"], [
AC_DEFINE(HAVE_NON_STANDARD,1,"have UNKNOWN_SEC events collect")
AC_SUBST([WITH_NON_STANDARD])
])
-AM_CONDITIONAL([WITH_NON_STANDARD], [test x$enable_non_standard = xyes || test x$enable_all == xyes])
+AM_CONDITIONAL([WITH_NON_STANDARD], [test x$enable_non_standard = xyes || test x$enable_all = xyes])
AM_COND_IF([WITH_NON_STANDARD], [USE_NON_STANDARD="yes"], [USE_NON_STANDARD="no"])
AC_ARG_ENABLE([arm],
AS_HELP_STRING([--enable-arm], [enable ARM events (currently experimental)]))
-AS_IF([test "x$enable_arm" = "xyes" || test "x$enable_all" == "xyes"], [
+AS_IF([test "x$enable_arm" = "xyes" || test "x$enable_all" = "xyes"], [
AC_DEFINE(HAVE_ARM,1,"have ARM events collect")
AC_SUBST([WITH_ARM])
])
-AM_CONDITIONAL([WITH_ARM], [test x$enable_arm = xyes || test x$enable_all == xyes])
+AM_CONDITIONAL([WITH_ARM], [test x$enable_arm = xyes || test x$enable_all = xyes])
AM_COND_IF([WITH_ARM], [USE_ARM="yes"], [USE_ARM="no"])
AC_ARG_ENABLE([mce],
AS_HELP_STRING([--enable-mce], [enable MCE events (currently experimental)]))
-AS_IF([test "x$enable_mce" = "xyes" || test "x$enable_all" == "xyes"], [
+AS_IF([test "x$enable_mce" = "xyes" || test "x$enable_all" = "xyes"], [
AC_DEFINE(HAVE_MCE,1,"have PCIe MCE events collect")
AC_SUBST([WITH_MCE])
])
-AM_CONDITIONAL([WITH_MCE], [test x$enable_mce = xyes || test x$enable_all == xyes])
+AM_CONDITIONAL([WITH_MCE], [test x$enable_mce = xyes || test x$enable_all = xyes])
AM_COND_IF([WITH_MCE], [USE_MCE="yes"], [USE_MCE="no"])
AC_ARG_ENABLE([extlog],
AS_HELP_STRING([--enable-extlog], [enable EXTLOG events (currently experimental)]))
-AS_IF([test "x$enable_extlog" = "xyes" || test "x$enable_all" == "xyes"], [
+AS_IF([test "x$enable_extlog" = "xyes" || test "x$enable_all" = "xyes"], [
AC_DEFINE(HAVE_EXTLOG,1,"have EXTLOG events collect")
AC_SUBST([WITH_EXTLOG])
])
-AM_CONDITIONAL([WITH_EXTLOG], [test x$enable_extlog = xyes || test x$enable_all == xyes])
+AM_CONDITIONAL([WITH_EXTLOG], [test x$enable_extlog = xyes || test x$enable_all = xyes])
AM_COND_IF([WITH_EXTLOG], [USE_EXTLOG="yes"], [USE_EXTLOG="no"])
AC_ARG_ENABLE([devlink],
AS_HELP_STRING([--enable-devlink], [enable devlink health events (currently experimental)]))
-AS_IF([test "x$enable_devlink" = "xyes" || test "x$enable_all" == "xyes"], [
+AS_IF([test "x$enable_devlink" = "xyes" || test "x$enable_all" = "xyes"], [
AC_DEFINE(HAVE_DEVLINK,1,"have devlink health events collect")
AC_SUBST([WITH_DEVLINK])
])
-AM_CONDITIONAL([WITH_DEVLINK], [test x$enable_devlink = xyes || test x$enable_all == xyes])
+AM_CONDITIONAL([WITH_DEVLINK], [test x$enable_devlink = xyes || test x$enable_all = xyes])
AM_COND_IF([WITH_DEVLINK], [USE_DEVLINK="yes"], [USE_DEVLINK="no"])
AC_ARG_ENABLE([diskerror],
AS_HELP_STRING([--enable-diskerror], [enable disk I/O error events (currently experimental)]))
-AS_IF([test "x$enable_diskerror" = "xyes" || test "x$enable_all" == "xyes"], [
+AS_IF([test "x$enable_diskerror" = "xyes" || test "x$enable_all" = "xyes"], [
AC_DEFINE(HAVE_DISKERROR,1,"have disk I/O errors collect")
AC_SUBST([WITH_DISKERROR])
])
-AM_CONDITIONAL([WITH_DISKERROR], [test x$enable_diskerror = xyes || test x$enable_all == xyes])
+AM_CONDITIONAL([WITH_DISKERROR], [test x$enable_diskerror = xyes || test x$enable_all = xyes])
AM_COND_IF([WITH_DISKERROR], [USE_DISKERROR="yes"], [USE_DISKERROR="no"])
AC_ARG_ENABLE([memory_failure],
AS_HELP_STRING([--enable-memory-failure], [enable memory failure events (currently experimental)]))
-AS_IF([test "x$enable_memory_failure" = "xyes" || test "x$enable_all" == "xyes"], [
+AS_IF([test "x$enable_memory_failure" = "xyes" || test "x$enable_all" = "xyes"], [
AC_DEFINE(HAVE_MEMORY_FAILURE,1,"have memory failure events collect")
AC_SUBST([WITH_MEMORY_FAILURE])
])
-AM_CONDITIONAL([WITH_MEMORY_FAILURE], [test x$enable_memory_failure = xyes || test x$enable_all == xyes])
+AM_CONDITIONAL([WITH_MEMORY_FAILURE], [test x$enable_memory_failure = xyes || test x$enable_all = xyes])
AM_COND_IF([WITH_MEMORY_FAILURE], [USE_MEMORY_FAILURE="yes"], [USE_MEMORY_FAILURE="no"])
AC_ARG_ENABLE([abrt_report],
AS_HELP_STRING([--enable-abrt-report], [enable report event to ABRT (currently experimental)]))
-AS_IF([test "x$enable_abrt_report" = "xyes" || test "x$enable_all" == "xyes"], [
+AS_IF([test "x$enable_abrt_report" = "xyes" || test "x$enable_all" = "xyes"], [
AC_DEFINE(HAVE_ABRT_REPORT,1,"have report event to ABRT")
AC_SUBST([WITH_ABRT_REPORT])
])
-AM_CONDITIONAL([WITH_ABRT_REPORT], [test x$enable_abrt_report = xyes || test x$enable_all == xyes])
+AM_CONDITIONAL([WITH_ABRT_REPORT], [test x$enable_abrt_report = xyes || test x$enable_all = xyes])
AM_COND_IF([WITH_ABRT_REPORT], [USE_ABRT_REPORT="yes"], [USE_ABRT_REPORT="no"])
AC_ARG_ENABLE([hisi_ns_decode],
AS_HELP_STRING([--enable-hisi-ns-decode], [enable HISI_NS_DECODE events (currently experimental)]))
-AS_IF([test "x$enable_hisi_ns_decode" = "xyes" || test "x$enable_all" == "xyes"], [
+AS_IF([test "x$enable_hisi_ns_decode" = "xyes" || test "x$enable_all" = "xyes"], [
AC_DEFINE(HAVE_HISI_NS_DECODE,1,"have HISI UNKNOWN_SEC events decode")
AC_SUBST([WITH_HISI_NS_DECODE])
])
-AM_CONDITIONAL([WITH_HISI_NS_DECODE], [test x$enable_hisi_ns_decode = xyes || test x$enable_all == xyes])
+AM_CONDITIONAL([WITH_HISI_NS_DECODE], [test x$enable_hisi_ns_decode = xyes || test x$enable_all = xyes])
AM_COND_IF([WITH_HISI_NS_DECODE], [USE_HISI_NS_DECODE="yes"], [USE_HISI_NS_DECODE="no"])
AC_ARG_ENABLE([memory_ce_pfa],
AS_HELP_STRING([--enable-memory-ce-pfa], [enable memory Corrected Error predictive failure analysis]))
-AS_IF([test "x$enable_memory_ce_pfa" = "xyes" || test "x$enable_all" == "xyes"], [
+AS_IF([test "x$enable_memory_ce_pfa" = "xyes" || test "x$enable_all" = "xyes"], [
AC_DEFINE(HAVE_MEMORY_CE_PFA,1,"have memory corrected error predictive failure analysis")
AC_SUBST([WITH_MEMORY_CE_PFA])
])
-AM_CONDITIONAL([WITH_MEMORY_CE_PFA], [test x$enable_memory_ce_pfa = xyes || test x$enable_all == xyes])
+AM_CONDITIONAL([WITH_MEMORY_CE_PFA], [test x$enable_memory_ce_pfa = xyes || test x$enable_all = xyes])
AM_COND_IF([WITH_MEMORY_CE_PFA], [USE_MEMORY_CE_PFA="yes"], [USE_MEMORY_CE_PFA="no"])
AC_ARG_ENABLE([amp_ns_decode],
AS_HELP_STRING([--enable-amp-ns-decode], [enable AMP_NS_DECODE events (currently experimental)]))
-AS_IF([test "x$enable_amp_ns_decode" = "xyes" || test "x$enable_all" == "xyes"], [
+AS_IF([test "x$enable_amp_ns_decode" = "xyes" || test "x$enable_all" = "xyes"], [
AC_DEFINE(HAVE_AMP_NS_DECODE,1,"have AMP UNKNOWN_SEC events decode")
AC_SUBST([WITH_AMP_NS_DECODE])
])
-AM_CONDITIONAL([WITH_AMP_NS_DECODE], [test x$enable_amp_ns_decode = xyes || test x$enable_all == xyes])
+AM_CONDITIONAL([WITH_AMP_NS_DECODE], [test x$enable_amp_ns_decode = xyes || test x$enable_all = xyes])
AM_COND_IF([WITH_AMP_NS_DECODE], [USE_AMP_NS_DECODE="yes"], [USE_AMP_NS_DECODE="no"])
test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
|
