diff options
-rwxr-xr-x | configure | 4 | ||||
-rw-r--r-- | configure.ac | 130 |
2 files changed, 68 insertions, 66 deletions
@@ -3562,10 +3562,10 @@ HAVE_OVERLAYFS="" | |||
3562 | 3562 | ||
3563 | # | 3563 | # |
3564 | #AC_ARG_ENABLE([overlayfs], | 3564 | #AC_ARG_ENABLE([overlayfs], |
3565 | # AS_HELP_STRING([--disable-overlayfs], [disable overlayfs])) | 3565 | # [AS_HELP_STRING([--disable-overlayfs], [disable overlayfs])]) |
3566 | #AS_IF([test "x$enable_overlayfs" != "xno"], [ | 3566 | #AS_IF([test "x$enable_overlayfs" != "xno"], [ |
3567 | # HAVE_OVERLAYFS="-DHAVE_OVERLAYFS" | 3567 | # HAVE_OVERLAYFS="-DHAVE_OVERLAYFS" |
3568 | # AC_SUBST(HAVE_OVERLAYFS) | 3568 | # AC_SUBST([HAVE_OVERLAYFS]) |
3569 | #]) | 3569 | #]) |
3570 | 3570 | ||
3571 | HAVE_OUTPUT="" | 3571 | HAVE_OUTPUT="" |
diff --git a/configure.ac b/configure.ac index 5acc0fe88..3f3d41bb9 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -41,13 +41,14 @@ AX_CHECK_COMPILE_FLAG( | |||
41 | ) | 41 | ) |
42 | 42 | ||
43 | AC_ARG_ENABLE([analyzer], | 43 | AC_ARG_ENABLE([analyzer], |
44 | AS_HELP_STRING([--enable-analyzer], [enable GCC static analyzer])) | 44 | [AS_HELP_STRING([--enable-analyzer], [enable GCC static analyzer])]) |
45 | AS_IF([test "x$enable_analyzer" = "xyes"], [ | 45 | AS_IF([test "x$enable_analyzer" = "xyes"], [ |
46 | EXTRA_CFLAGS="$EXTRA_CFLAGS -fanalyzer -Wno-analyzer-malloc-leak" | 46 | EXTRA_CFLAGS="$EXTRA_CFLAGS -fanalyzer -Wno-analyzer-malloc-leak" |
47 | ]) | 47 | ]) |
48 | 48 | ||
49 | AC_ARG_ENABLE([sanitizer], | 49 | AC_ARG_ENABLE([sanitizer], |
50 | AS_HELP_STRING([--enable-sanitizer=@<:@address | memory | undefined@:>@], [enable a compiler-based sanitizer (debug)]), [], [enable_sanitizer=no]) | 50 | [AS_HELP_STRING([--enable-sanitizer=@<:@address | memory | undefined@:>@], [enable a compiler-based sanitizer (debug)])], |
51 | [], [enable_sanitizer=no]) | ||
51 | AS_IF([test "x$enable_sanitizer" != "xno" ], | 52 | AS_IF([test "x$enable_sanitizer" != "xno" ], |
52 | [AX_CHECK_COMPILE_FLAG([-fsanitize=$enable_sanitizer], [ | 53 | [AX_CHECK_COMPILE_FLAG([-fsanitize=$enable_sanitizer], [ |
53 | EXTRA_CFLAGS="$EXTRA_CFLAGS -fsanitize=$enable_sanitizer -fno-omit-frame-pointer" | 54 | EXTRA_CFLAGS="$EXTRA_CFLAGS -fsanitize=$enable_sanitizer -fno-omit-frame-pointer" |
@@ -57,21 +58,21 @@ AS_IF([test "x$enable_sanitizer" != "xno" ], | |||
57 | 58 | ||
58 | HAVE_APPARMOR="" | 59 | HAVE_APPARMOR="" |
59 | AC_ARG_ENABLE([apparmor], | 60 | AC_ARG_ENABLE([apparmor], |
60 | AS_HELP_STRING([--enable-apparmor], [enable apparmor])) | 61 | [AS_HELP_STRING([--enable-apparmor], [enable apparmor])]) |
61 | AS_IF([test "x$enable_apparmor" = "xyes"], [ | 62 | AS_IF([test "x$enable_apparmor" = "xyes"], [ |
62 | HAVE_APPARMOR="-DHAVE_APPARMOR" | 63 | HAVE_APPARMOR="-DHAVE_APPARMOR" |
63 | PKG_CHECK_MODULES([AA], libapparmor, | 64 | PKG_CHECK_MODULES([AA], [libapparmor], |
64 | [EXTRA_CFLAGS="$EXTRA_CFLAGS $AA_CFLAGS" && EXTRA_LDFLAGS="$EXTRA_LDFLAGS $AA_LIBS"]) | 65 | [EXTRA_CFLAGS="$EXTRA_CFLAGS $AA_CFLAGS" && EXTRA_LDFLAGS="$EXTRA_LDFLAGS $AA_LIBS"]) |
65 | AC_SUBST(HAVE_APPARMOR) | 66 | AC_SUBST([HAVE_APPARMOR]) |
66 | ]) | 67 | ]) |
67 | 68 | ||
68 | HAVE_SELINUX="" | 69 | HAVE_SELINUX="" |
69 | AC_ARG_ENABLE([selinux], | 70 | AC_ARG_ENABLE([selinux], |
70 | AS_HELP_STRING([--enable-selinux], [SELinux labeling support])) | 71 | [AS_HELP_STRING([--enable-selinux], [SELinux labeling support])]) |
71 | AS_IF([test "x$enable_selinux" = "xyes"], [ | 72 | AS_IF([test "x$enable_selinux" = "xyes"], [ |
72 | HAVE_SELINUX="-DHAVE_SELINUX" | 73 | HAVE_SELINUX="-DHAVE_SELINUX" |
73 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lselinux" | 74 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lselinux" |
74 | AC_SUBST(HAVE_SELINUX) | 75 | AC_SUBST([HAVE_SELINUX]) |
75 | ]) | 76 | ]) |
76 | 77 | ||
77 | AC_SUBST([EXTRA_CFLAGS]) | 78 | AC_SUBST([EXTRA_CFLAGS]) |
@@ -80,219 +81,220 @@ AC_SUBST([EXTRA_LDFLAGS]) | |||
80 | 81 | ||
81 | HAVE_DBUSPROXY="" | 82 | HAVE_DBUSPROXY="" |
82 | AC_ARG_ENABLE([dbusproxy], | 83 | AC_ARG_ENABLE([dbusproxy], |
83 | AS_HELP_STRING([--disable-dbusproxy], [disable dbus proxy])) | 84 | [AS_HELP_STRING([--disable-dbusproxy], [disable dbus proxy])]) |
84 | AS_IF([test "x$enable_dbusproxy" != "xno"], [ | 85 | AS_IF([test "x$enable_dbusproxy" != "xno"], [ |
85 | HAVE_DBUSPROXY="-DHAVE_DBUSPROXY" | 86 | HAVE_DBUSPROXY="-DHAVE_DBUSPROXY" |
86 | AC_SUBST(HAVE_DBUSPROXY) | 87 | AC_SUBST([HAVE_DBUSPROXY]) |
87 | ]) | 88 | ]) |
88 | 89 | ||
89 | # overlayfs features temporarily disabled pending fixes | 90 | # overlayfs features temporarily disabled pending fixes |
90 | HAVE_OVERLAYFS="" | 91 | HAVE_OVERLAYFS="" |
91 | AC_SUBST(HAVE_OVERLAYFS) | 92 | AC_SUBST([HAVE_OVERLAYFS]) |
92 | # | 93 | # |
93 | #AC_ARG_ENABLE([overlayfs], | 94 | #AC_ARG_ENABLE([overlayfs], |
94 | # AS_HELP_STRING([--disable-overlayfs], [disable overlayfs])) | 95 | # [AS_HELP_STRING([--disable-overlayfs], [disable overlayfs])]) |
95 | #AS_IF([test "x$enable_overlayfs" != "xno"], [ | 96 | #AS_IF([test "x$enable_overlayfs" != "xno"], [ |
96 | # HAVE_OVERLAYFS="-DHAVE_OVERLAYFS" | 97 | # HAVE_OVERLAYFS="-DHAVE_OVERLAYFS" |
97 | # AC_SUBST(HAVE_OVERLAYFS) | 98 | # AC_SUBST([HAVE_OVERLAYFS]) |
98 | #]) | 99 | #]) |
99 | 100 | ||
100 | HAVE_OUTPUT="" | 101 | HAVE_OUTPUT="" |
101 | AC_ARG_ENABLE([output], | 102 | AC_ARG_ENABLE([output], |
102 | AS_HELP_STRING([--disable-output], [disable --output logging])) | 103 | [AS_HELP_STRING([--disable-output], [disable --output logging])]) |
103 | AS_IF([test "x$enable_output" != "xno"], [ | 104 | AS_IF([test "x$enable_output" != "xno"], [ |
104 | HAVE_OUTPUT="-DHAVE_OUTPUT" | 105 | HAVE_OUTPUT="-DHAVE_OUTPUT" |
105 | AC_SUBST(HAVE_OUTPUT) | 106 | AC_SUBST([HAVE_OUTPUT]) |
106 | ]) | 107 | ]) |
107 | 108 | ||
108 | HAVE_USERTMPFS="" | 109 | HAVE_USERTMPFS="" |
109 | AC_ARG_ENABLE([usertmpfs], | 110 | AC_ARG_ENABLE([usertmpfs], |
110 | AS_HELP_STRING([--disable-usertmpfs], [disable tmpfs as regular user])) | 111 | [AS_HELP_STRING([--disable-usertmpfs], [disable tmpfs as regular user])]) |
111 | AS_IF([test "x$enable_usertmpfs" != "xno"], [ | 112 | AS_IF([test "x$enable_usertmpfs" != "xno"], [ |
112 | HAVE_USERTMPFS="-DHAVE_USERTMPFS" | 113 | HAVE_USERTMPFS="-DHAVE_USERTMPFS" |
113 | AC_SUBST(HAVE_USERTMPFS) | 114 | AC_SUBST([HAVE_USERTMPFS]) |
114 | ]) | 115 | ]) |
115 | 116 | ||
116 | HAVE_MAN="no" | 117 | HAVE_MAN="no" |
117 | AC_ARG_ENABLE([man], | 118 | AC_ARG_ENABLE([man], |
118 | AS_HELP_STRING([--disable-man], [disable man pages])) | 119 | [AS_HELP_STRING([--disable-man], [disable man pages])]) |
119 | AS_IF([test "x$enable_man" != "xno"], [ | 120 | AS_IF([test "x$enable_man" != "xno"], [ |
120 | HAVE_MAN="-DHAVE_MAN" | 121 | HAVE_MAN="-DHAVE_MAN" |
121 | AC_SUBST(HAVE_MAN) | 122 | AC_SUBST([HAVE_MAN]) |
122 | AC_CHECK_PROG([HAVE_GAWK], [gawk], [yes], [no]) | 123 | AC_CHECK_PROG([HAVE_GAWK], [gawk], [yes], [no]) |
123 | AS_IF([test "x$HAVE_GAWK" != "xyes"], [AC_MSG_ERROR([*** gawk not found ***])]) | 124 | AS_IF([test "x$HAVE_GAWK" != "xyes"], [AC_MSG_ERROR([*** gawk not found ***])]) |
124 | ]) | 125 | ]) |
125 | 126 | ||
126 | HAVE_FIRETUNNEL="" | 127 | HAVE_FIRETUNNEL="" |
127 | AC_ARG_ENABLE([firetunnel], | 128 | AC_ARG_ENABLE([firetunnel], |
128 | AS_HELP_STRING([--disable-firetunnel], [disable firetunnel])) | 129 | [AS_HELP_STRING([--disable-firetunnel], [disable firetunnel])]) |
129 | AS_IF([test "x$enable_firetunnel" != "xno"], [ | 130 | AS_IF([test "x$enable_firetunnel" != "xno"], [ |
130 | HAVE_FIRETUNNEL="-DHAVE_FIRETUNNEL" | 131 | HAVE_FIRETUNNEL="-DHAVE_FIRETUNNEL" |
131 | AC_SUBST(HAVE_FIRETUNNEL) | 132 | AC_SUBST([HAVE_FIRETUNNEL]) |
132 | ]) | 133 | ]) |
133 | 134 | ||
134 | HAVE_PRIVATEHOME="" | 135 | HAVE_PRIVATEHOME="" |
135 | AC_ARG_ENABLE([private-home], | 136 | AC_ARG_ENABLE([private-home], |
136 | AS_HELP_STRING([--disable-private-home], [disable private home feature])) | 137 | [AS_HELP_STRING([--disable-private-home], [disable private home feature])]) |
137 | AS_IF([test "x$enable_private_home" != "xno"], [ | 138 | AS_IF([test "x$enable_private_home" != "xno"], [ |
138 | HAVE_PRIVATE_HOME="-DHAVE_PRIVATE_HOME" | 139 | HAVE_PRIVATE_HOME="-DHAVE_PRIVATE_HOME" |
139 | AC_SUBST(HAVE_PRIVATE_HOME) | 140 | AC_SUBST([HAVE_PRIVATE_HOME]) |
140 | ]) | 141 | ]) |
141 | 142 | ||
142 | HAVE_CHROOT="" | 143 | HAVE_CHROOT="" |
143 | AC_ARG_ENABLE([chroot], | 144 | AC_ARG_ENABLE([chroot], |
144 | AS_HELP_STRING([--disable-chroot], [disable chroot])) | 145 | [AS_HELP_STRING([--disable-chroot], [disable chroot])]) |
145 | AS_IF([test "x$enable_chroot" != "xno"], [ | 146 | AS_IF([test "x$enable_chroot" != "xno"], [ |
146 | HAVE_CHROOT="-DHAVE_CHROOT" | 147 | HAVE_CHROOT="-DHAVE_CHROOT" |
147 | AC_SUBST(HAVE_CHROOT) | 148 | AC_SUBST([HAVE_CHROOT]) |
148 | ]) | 149 | ]) |
149 | 150 | ||
150 | HAVE_GLOBALCFG="" | 151 | HAVE_GLOBALCFG="" |
151 | AC_ARG_ENABLE([globalcfg], | 152 | AC_ARG_ENABLE([globalcfg], |
152 | AS_HELP_STRING([--disable-globalcfg], [if the global config file firejail.cfg is not present, continue the program using defaults])) | 153 | [AS_HELP_STRING([--disable-globalcfg], |
154 | [if the global config file firejail.cfg is not present, continue the program using defaults])]) | ||
153 | AS_IF([test "x$enable_globalcfg" != "xno"], [ | 155 | AS_IF([test "x$enable_globalcfg" != "xno"], [ |
154 | HAVE_GLOBALCFG="-DHAVE_GLOBALCFG" | 156 | HAVE_GLOBALCFG="-DHAVE_GLOBALCFG" |
155 | AC_SUBST(HAVE_GLOBALCFG) | 157 | AC_SUBST([HAVE_GLOBALCFG]) |
156 | ]) | 158 | ]) |
157 | 159 | ||
158 | HAVE_NETWORK="" | 160 | HAVE_NETWORK="" |
159 | AC_ARG_ENABLE([network], | 161 | AC_ARG_ENABLE([network], |
160 | AS_HELP_STRING([--disable-network], [disable network])) | 162 | [AS_HELP_STRING([--disable-network], [disable network])]) |
161 | AS_IF([test "x$enable_network" != "xno"], [ | 163 | AS_IF([test "x$enable_network" != "xno"], [ |
162 | HAVE_NETWORK="-DHAVE_NETWORK" | 164 | HAVE_NETWORK="-DHAVE_NETWORK" |
163 | AC_SUBST(HAVE_NETWORK) | 165 | AC_SUBST([HAVE_NETWORK]) |
164 | ]) | 166 | ]) |
165 | 167 | ||
166 | HAVE_USERNS="" | 168 | HAVE_USERNS="" |
167 | AC_ARG_ENABLE([userns], | 169 | AC_ARG_ENABLE([userns], |
168 | AS_HELP_STRING([--disable-userns], [disable user namespace])) | 170 | [AS_HELP_STRING([--disable-userns], [disable user namespace])]) |
169 | AS_IF([test "x$enable_userns" != "xno"], [ | 171 | AS_IF([test "x$enable_userns" != "xno"], [ |
170 | HAVE_USERNS="-DHAVE_USERNS" | 172 | HAVE_USERNS="-DHAVE_USERNS" |
171 | AC_SUBST(HAVE_USERNS) | 173 | AC_SUBST([HAVE_USERNS]) |
172 | ]) | 174 | ]) |
173 | 175 | ||
174 | HAVE_X11="" | 176 | HAVE_X11="" |
175 | AC_ARG_ENABLE([x11], | 177 | AC_ARG_ENABLE([x11], |
176 | AS_HELP_STRING([--disable-x11], [disable X11 sandboxing support])) | 178 | [AS_HELP_STRING([--disable-x11], [disable X11 sandboxing support])]) |
177 | AS_IF([test "x$enable_x11" != "xno"], [ | 179 | AS_IF([test "x$enable_x11" != "xno"], [ |
178 | HAVE_X11="-DHAVE_X11" | 180 | HAVE_X11="-DHAVE_X11" |
179 | AC_SUBST(HAVE_X11) | 181 | AC_SUBST([HAVE_X11]) |
180 | ]) | 182 | ]) |
181 | 183 | ||
182 | HAVE_FILE_TRANSFER="" | 184 | HAVE_FILE_TRANSFER="" |
183 | AC_ARG_ENABLE([file-transfer], | 185 | AC_ARG_ENABLE([file-transfer], |
184 | AS_HELP_STRING([--disable-file-transfer], [disable file transfer])) | 186 | [AS_HELP_STRING([--disable-file-transfer], [disable file transfer])]) |
185 | AS_IF([test "x$enable_file_transfer" != "xno"], [ | 187 | AS_IF([test "x$enable_file_transfer" != "xno"], [ |
186 | HAVE_FILE_TRANSFER="-DHAVE_FILE_TRANSFER" | 188 | HAVE_FILE_TRANSFER="-DHAVE_FILE_TRANSFER" |
187 | AC_SUBST(HAVE_FILE_TRANSFER) | 189 | AC_SUBST([HAVE_FILE_TRANSFER]) |
188 | ]) | 190 | ]) |
189 | 191 | ||
190 | HAVE_SUID="" | 192 | HAVE_SUID="" |
191 | AC_ARG_ENABLE([suid], | 193 | AC_ARG_ENABLE([suid], |
192 | AS_HELP_STRING([--disable-suid], [install as a non-SUID executable])) | 194 | [AS_HELP_STRING([--disable-suid], [install as a non-SUID executable])]) |
193 | AS_IF([test "x$enable_suid" = "xno"], | 195 | AS_IF([test "x$enable_suid" = "xno"], |
194 | [HAVE_SUID="no"], | 196 | [HAVE_SUID="no"], |
195 | [HAVE_SUID="yes"] | 197 | [HAVE_SUID="yes"] |
196 | ) | 198 | ) |
197 | AC_SUBST(HAVE_SUID) | 199 | AC_SUBST([HAVE_SUID]) |
198 | 200 | ||
199 | HAVE_FATAL_WARNINGS="" | 201 | HAVE_FATAL_WARNINGS="" |
200 | AC_ARG_ENABLE([fatal_warnings], | 202 | AC_ARG_ENABLE([fatal_warnings], |
201 | AS_HELP_STRING([--enable-fatal-warnings], [-W -Wall -Werror])) | 203 | [AS_HELP_STRING([--enable-fatal-warnings], [-W -Wall -Werror])]) |
202 | AS_IF([test "x$enable_fatal_warnings" = "xyes"], [ | 204 | AS_IF([test "x$enable_fatal_warnings" = "xyes"], [ |
203 | HAVE_FATAL_WARNINGS="-W -Wall -Werror" | 205 | HAVE_FATAL_WARNINGS="-W -Wall -Werror" |
204 | AC_SUBST(HAVE_FATAL_WARNINGS) | 206 | AC_SUBST([HAVE_FATAL_WARNINGS]) |
205 | ]) | 207 | ]) |
206 | 208 | ||
207 | BUSYBOX_WORKAROUND="no" | 209 | BUSYBOX_WORKAROUND="no" |
208 | AC_ARG_ENABLE([busybox-workaround], | 210 | AC_ARG_ENABLE([busybox-workaround], |
209 | AS_HELP_STRING([--enable-busybox-workaround], [enable busybox workaround])) | 211 | [AS_HELP_STRING([--enable-busybox-workaround], [enable busybox workaround])]) |
210 | AS_IF([test "x$enable_busybox_workaround" = "xyes"], [ | 212 | AS_IF([test "x$enable_busybox_workaround" = "xyes"], [ |
211 | BUSYBOX_WORKAROUND="yes" | 213 | BUSYBOX_WORKAROUND="yes" |
212 | AC_SUBST(BUSYBOX_WORKAROUND) | 214 | AC_SUBST([BUSYBOX_WORKAROUND]) |
213 | ]) | 215 | ]) |
214 | 216 | ||
215 | 217 | ||
216 | HAVE_GCOV="" | 218 | HAVE_GCOV="" |
217 | AC_ARG_ENABLE([gcov], | 219 | AC_ARG_ENABLE([gcov], |
218 | AS_HELP_STRING([--enable-gcov], [Gcov instrumentation])) | 220 | [AS_HELP_STRING([--enable-gcov], [Gcov instrumentation])]) |
219 | AS_IF([test "x$enable_gcov" = "xyes"], [ | 221 | AS_IF([test "x$enable_gcov" = "xyes"], [ |
220 | HAVE_GCOV="--coverage -DHAVE_GCOV" | 222 | HAVE_GCOV="--coverage -DHAVE_GCOV" |
221 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lgcov --coverage" | 223 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lgcov --coverage" |
222 | AC_SUBST(HAVE_GCOV) | 224 | AC_SUBST([HAVE_GCOV]) |
223 | ]) | 225 | ]) |
224 | 226 | ||
225 | HAVE_CONTRIB_INSTALL="yes" | 227 | HAVE_CONTRIB_INSTALL="yes" |
226 | AC_ARG_ENABLE([contrib-install], | 228 | AC_ARG_ENABLE([contrib-install], |
227 | AS_HELP_STRING([--enable-contrib-install], [install contrib scripts])) | 229 | [AS_HELP_STRING([--enable-contrib-install], [install contrib scripts])]) |
228 | AS_IF([test "x$enable_contrib_install" = "xno"], | 230 | AS_IF([test "x$enable_contrib_install" = "xno"], |
229 | [HAVE_CONTRIB_INSTALL="no"], | 231 | [HAVE_CONTRIB_INSTALL="no"], |
230 | [HAVE_CONTRIB_INSTALL="yes"] | 232 | [HAVE_CONTRIB_INSTALL="yes"] |
231 | ) | 233 | ) |
232 | AC_SUBST(HAVE_CONTRIB_INSTALL) | 234 | AC_SUBST([HAVE_CONTRIB_INSTALL]) |
233 | 235 | ||
234 | HAVE_FORCE_NONEWPRIVS="" | 236 | HAVE_FORCE_NONEWPRIVS="" |
235 | AC_ARG_ENABLE([force-nonewprivs], | 237 | AC_ARG_ENABLE([force-nonewprivs], |
236 | AS_HELP_STRING([--enable-force-nonewprivs], [enable force nonewprivs])) | 238 | [AS_HELP_STRING([--enable-force-nonewprivs], [enable force nonewprivs])]) |
237 | AS_IF([test "x$enable_force_nonewprivs" = "xyes"], [ | 239 | AS_IF([test "x$enable_force_nonewprivs" = "xyes"], [ |
238 | HAVE_FORCE_NONEWPRIVS="-DHAVE_FORCE_NONEWPRIVS" | 240 | HAVE_FORCE_NONEWPRIVS="-DHAVE_FORCE_NONEWPRIVS" |
239 | AC_SUBST(HAVE_FORCE_NONEWPRIVS) | 241 | AC_SUBST([HAVE_FORCE_NONEWPRIVS]) |
240 | ]) | 242 | ]) |
241 | 243 | ||
242 | HAVE_LTS="" | 244 | HAVE_LTS="" |
243 | AC_ARG_ENABLE([lts], | 245 | AC_ARG_ENABLE([lts], |
244 | AS_HELP_STRING([--enable-lts], [enable long-term support software version (LTS)])) | 246 | [AS_HELP_STRING([--enable-lts], [enable long-term support software version (LTS)])]) |
245 | AS_IF([test "x$enable_lts" = "xyes"], [ | 247 | AS_IF([test "x$enable_lts" = "xyes"], [ |
246 | HAVE_LTS="-DHAVE_LTS" | 248 | HAVE_LTS="-DHAVE_LTS" |
247 | AC_SUBST(HAVE_LTS) | 249 | AC_SUBST([HAVE_LTS]) |
248 | 250 | ||
249 | HAVE_DBUSPROXY="" | 251 | HAVE_DBUSPROXY="" |
250 | AC_SUBST(HAVE_DBUSPROXY) | 252 | AC_SUBST([HAVE_DBUSPROXY]) |
251 | 253 | ||
252 | HAVE_OVERLAYFS="" | 254 | HAVE_OVERLAYFS="" |
253 | AC_SUBST(HAVE_OVERLAYFS) | 255 | AC_SUBST([HAVE_OVERLAYFS]) |
254 | 256 | ||
255 | HAVE_OUTPUT="" | 257 | HAVE_OUTPUT="" |
256 | AC_SUBST(HAVE_OUTPUT) | 258 | AC_SUBST([HAVE_OUTPUT]) |
257 | 259 | ||
258 | HAVE_USERTMPFS="" | 260 | HAVE_USERTMPFS="" |
259 | AC_SUBST(HAVE_USERTMPFS) | 261 | AC_SUBST([HAVE_USERTMPFS]) |
260 | 262 | ||
261 | HAVE_MAN="-DHAVE_MAN" | 263 | HAVE_MAN="-DHAVE_MAN" |
262 | AC_SUBST(HAVE_MAN) | 264 | AC_SUBST([HAVE_MAN]) |
263 | 265 | ||
264 | HAVE_FIRETUNNEL="" | 266 | HAVE_FIRETUNNEL="" |
265 | AC_SUBST(HAVE_FIRETUNNEL) | 267 | AC_SUBST([HAVE_FIRETUNNEL]) |
266 | 268 | ||
267 | HAVE_PRIVATEHOME="" | 269 | HAVE_PRIVATEHOME="" |
268 | AC_SUBST(HAVE_PRIVATE_HOME) | 270 | AC_SUBST([HAVE_PRIVATE_HOME]) |
269 | 271 | ||
270 | HAVE_CHROOT="" | 272 | HAVE_CHROOT="" |
271 | AC_SUBST(HAVE_CHROOT) | 273 | AC_SUBST([HAVE_CHROOT]) |
272 | 274 | ||
273 | HAVE_GLOBALCFG="" | 275 | HAVE_GLOBALCFG="" |
274 | AC_SUBST(HAVE_GLOBALCFG) | 276 | AC_SUBST([HAVE_GLOBALCFG]) |
275 | 277 | ||
276 | HAVE_USERNS="" | 278 | HAVE_USERNS="" |
277 | AC_SUBST(HAVE_USERNS) | 279 | AC_SUBST([HAVE_USERNS]) |
278 | 280 | ||
279 | HAVE_X11="" | 281 | HAVE_X11="" |
280 | AC_SUBST(HAVE_X11) | 282 | AC_SUBST([HAVE_X11]) |
281 | 283 | ||
282 | HAVE_FILE_TRANSFER="" | 284 | HAVE_FILE_TRANSFER="" |
283 | AC_SUBST(HAVE_FILE_TRANSFER) | 285 | AC_SUBST([HAVE_FILE_TRANSFER]) |
284 | 286 | ||
285 | HAVE_SUID="yes" | 287 | HAVE_SUID="yes" |
286 | AC_SUBST(HAVE_SUID) | 288 | AC_SUBST([HAVE_SUID]) |
287 | 289 | ||
288 | BUSYBOX_WORKAROUND="no" | 290 | BUSYBOX_WORKAROUND="no" |
289 | AC_SUBST(BUSYBOX_WORKAROUND) | 291 | AC_SUBST([BUSYBOX_WORKAROUND]) |
290 | 292 | ||
291 | HAVE_CONTRIB_INSTALL="no", | 293 | HAVE_CONTRIB_INSTALL="no", |
292 | AC_SUBST(HAVE_CONTRIB_INSTALL) | 294 | AC_SUBST([HAVE_CONTRIB_INSTALL]) |
293 | ]) | 295 | ]) |
294 | 296 | ||
295 | AC_CHECK_HEADER([linux/seccomp.h],,AC_MSG_ERROR([*** SECCOMP support is not installed (/usr/include/linux/seccomp.h missing) ***])) | 297 | AC_CHECK_HEADER([linux/seccomp.h], [], AC_MSG_ERROR([*** SECCOMP support is not installed (/usr/include/linux/seccomp.h missing) ***])) |
296 | 298 | ||
297 | # set sysconfdir | 299 | # set sysconfdir |
298 | if test "$prefix" = /usr; then | 300 | if test "$prefix" = /usr; then |