diff options
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 111 |
1 files changed, 94 insertions, 17 deletions
@@ -642,6 +642,7 @@ HAVE_GLOBALCFG | |||
642 | HAVE_CHROOT | 642 | HAVE_CHROOT |
643 | HAVE_SECCOMP | 643 | HAVE_SECCOMP |
644 | HAVE_PRIVATE_HOME | 644 | HAVE_PRIVATE_HOME |
645 | HAVE_FIRETUNNEL | ||
645 | HAVE_OVERLAYFS | 646 | HAVE_OVERLAYFS |
646 | EXTRA_LDFLAGS | 647 | EXTRA_LDFLAGS |
647 | EXTRA_CFLAGS | 648 | EXTRA_CFLAGS |
@@ -681,7 +682,6 @@ infodir | |||
681 | docdir | 682 | docdir |
682 | oldincludedir | 683 | oldincludedir |
683 | includedir | 684 | includedir |
684 | runstatedir | ||
685 | localstatedir | 685 | localstatedir |
686 | sharedstatedir | 686 | sharedstatedir |
687 | sysconfdir | 687 | sysconfdir |
@@ -706,6 +706,7 @@ ac_user_opts=' | |||
706 | enable_option_checking | 706 | enable_option_checking |
707 | enable_apparmor | 707 | enable_apparmor |
708 | enable_overlayfs | 708 | enable_overlayfs |
709 | enable_firetunnel | ||
709 | enable_private_home | 710 | enable_private_home |
710 | enable_seccomp | 711 | enable_seccomp |
711 | enable_chroot | 712 | enable_chroot |
@@ -773,7 +774,6 @@ datadir='${datarootdir}' | |||
773 | sysconfdir='${prefix}/etc' | 774 | sysconfdir='${prefix}/etc' |
774 | sharedstatedir='${prefix}/com' | 775 | sharedstatedir='${prefix}/com' |
775 | localstatedir='${prefix}/var' | 776 | localstatedir='${prefix}/var' |
776 | runstatedir='${localstatedir}/run' | ||
777 | includedir='${prefix}/include' | 777 | includedir='${prefix}/include' |
778 | oldincludedir='/usr/include' | 778 | oldincludedir='/usr/include' |
779 | docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' | 779 | docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' |
@@ -1026,15 +1026,6 @@ do | |||
1026 | | -silent | --silent | --silen | --sile | --sil) | 1026 | | -silent | --silent | --silen | --sile | --sil) |
1027 | silent=yes ;; | 1027 | silent=yes ;; |
1028 | 1028 | ||
1029 | -runstatedir | --runstatedir | --runstatedi | --runstated \ | ||
1030 | | --runstate | --runstat | --runsta | --runst | --runs \ | ||
1031 | | --run | --ru | --r) | ||
1032 | ac_prev=runstatedir ;; | ||
1033 | -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ | ||
1034 | | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ | ||
1035 | | --run=* | --ru=* | --r=*) | ||
1036 | runstatedir=$ac_optarg ;; | ||
1037 | |||
1038 | -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) | 1029 | -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) |
1039 | ac_prev=sbindir ;; | 1030 | ac_prev=sbindir ;; |
1040 | -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ | 1031 | -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ |
@@ -1172,7 +1163,7 @@ fi | |||
1172 | for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ | 1163 | for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ |
1173 | datadir sysconfdir sharedstatedir localstatedir includedir \ | 1164 | datadir sysconfdir sharedstatedir localstatedir includedir \ |
1174 | oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ | 1165 | oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ |
1175 | libdir localedir mandir runstatedir | 1166 | libdir localedir mandir |
1176 | do | 1167 | do |
1177 | eval ac_val=\$$ac_var | 1168 | eval ac_val=\$$ac_var |
1178 | # Remove trailing slashes. | 1169 | # Remove trailing slashes. |
@@ -1325,7 +1316,6 @@ Fine tuning of the installation directories: | |||
1325 | --sysconfdir=DIR read-only single-machine data [PREFIX/etc] | 1316 | --sysconfdir=DIR read-only single-machine data [PREFIX/etc] |
1326 | --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] | 1317 | --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] |
1327 | --localstatedir=DIR modifiable single-machine data [PREFIX/var] | 1318 | --localstatedir=DIR modifiable single-machine data [PREFIX/var] |
1328 | --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] | ||
1329 | --libdir=DIR object code libraries [EPREFIX/lib] | 1319 | --libdir=DIR object code libraries [EPREFIX/lib] |
1330 | --includedir=DIR C header files [PREFIX/include] | 1320 | --includedir=DIR C header files [PREFIX/include] |
1331 | --oldincludedir=DIR C header files for non-gcc [/usr/include] | 1321 | --oldincludedir=DIR C header files for non-gcc [/usr/include] |
@@ -1357,6 +1347,7 @@ Optional Features: | |||
1357 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] | 1347 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] |
1358 | --enable-apparmor enable apparmor | 1348 | --enable-apparmor enable apparmor |
1359 | --disable-overlayfs disable overlayfs | 1349 | --disable-overlayfs disable overlayfs |
1350 | --disable-firetunnel disable firetunnel | ||
1360 | --disable-private-home disable private home feature | 1351 | --disable-private-home disable private home feature |
1361 | --disable-seccomp disable seccomp | 1352 | --disable-seccomp disable seccomp |
1362 | --disable-chroot disable chroot | 1353 | --disable-chroot disable chroot |
@@ -3191,6 +3182,78 @@ else | |||
3191 | : | 3182 | : |
3192 | fi | 3183 | fi |
3193 | 3184 | ||
3185 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fstack-clash-protection" >&5 | ||
3186 | $as_echo_n "checking whether C compiler accepts -fstack-clash-protection... " >&6; } | ||
3187 | if ${ax_cv_check_cflags___fstack_clash_protection+:} false; then : | ||
3188 | $as_echo_n "(cached) " >&6 | ||
3189 | else | ||
3190 | |||
3191 | ax_check_save_flags=$CFLAGS | ||
3192 | CFLAGS="$CFLAGS -fstack-clash-protection" | ||
3193 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3194 | /* end confdefs.h. */ | ||
3195 | |||
3196 | int | ||
3197 | main () | ||
3198 | { | ||
3199 | |||
3200 | ; | ||
3201 | return 0; | ||
3202 | } | ||
3203 | _ACEOF | ||
3204 | if ac_fn_c_try_compile "$LINENO"; then : | ||
3205 | ax_cv_check_cflags___fstack_clash_protection=yes | ||
3206 | else | ||
3207 | ax_cv_check_cflags___fstack_clash_protection=no | ||
3208 | fi | ||
3209 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3210 | CFLAGS=$ax_check_save_flags | ||
3211 | fi | ||
3212 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fstack_clash_protection" >&5 | ||
3213 | $as_echo "$ax_cv_check_cflags___fstack_clash_protection" >&6; } | ||
3214 | if test "x$ax_cv_check_cflags___fstack_clash_protection" = xyes; then : | ||
3215 | HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -fstack-clash-protection" | ||
3216 | |||
3217 | else | ||
3218 | : | ||
3219 | fi | ||
3220 | |||
3221 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fstack-protector-strong" >&5 | ||
3222 | $as_echo_n "checking whether C compiler accepts -fstack-protector-strong... " >&6; } | ||
3223 | if ${ax_cv_check_cflags___fstack_protector_strong+:} false; then : | ||
3224 | $as_echo_n "(cached) " >&6 | ||
3225 | else | ||
3226 | |||
3227 | ax_check_save_flags=$CFLAGS | ||
3228 | CFLAGS="$CFLAGS -fstack-protector-strong" | ||
3229 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3230 | /* end confdefs.h. */ | ||
3231 | |||
3232 | int | ||
3233 | main () | ||
3234 | { | ||
3235 | |||
3236 | ; | ||
3237 | return 0; | ||
3238 | } | ||
3239 | _ACEOF | ||
3240 | if ac_fn_c_try_compile "$LINENO"; then : | ||
3241 | ax_cv_check_cflags___fstack_protector_strong=yes | ||
3242 | else | ||
3243 | ax_cv_check_cflags___fstack_protector_strong=no | ||
3244 | fi | ||
3245 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3246 | CFLAGS=$ax_check_save_flags | ||
3247 | fi | ||
3248 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fstack_protector_strong" >&5 | ||
3249 | $as_echo "$ax_cv_check_cflags___fstack_protector_strong" >&6; } | ||
3250 | if test "x$ax_cv_check_cflags___fstack_protector_strong" = xyes; then : | ||
3251 | HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -fstack-protector-strong" | ||
3252 | |||
3253 | else | ||
3254 | : | ||
3255 | fi | ||
3256 | |||
3194 | 3257 | ||
3195 | HAVE_APPARMOR="" | 3258 | HAVE_APPARMOR="" |
3196 | # Check whether --enable-apparmor was given. | 3259 | # Check whether --enable-apparmor was given. |
@@ -3323,8 +3386,8 @@ if test "x$enable_apparmor" = "xyes"; then : | |||
3323 | HAVE_APPARMOR="-DHAVE_APPARMOR" | 3386 | HAVE_APPARMOR="-DHAVE_APPARMOR" |
3324 | 3387 | ||
3325 | pkg_failed=no | 3388 | pkg_failed=no |
3326 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AA" >&5 | 3389 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libapparmor" >&5 |
3327 | $as_echo_n "checking for AA... " >&6; } | 3390 | $as_echo_n "checking for libapparmor... " >&6; } |
3328 | 3391 | ||
3329 | if test -n "$AA_CFLAGS"; then | 3392 | if test -n "$AA_CFLAGS"; then |
3330 | pkg_cv_AA_CFLAGS="$AA_CFLAGS" | 3393 | pkg_cv_AA_CFLAGS="$AA_CFLAGS" |
@@ -3364,7 +3427,7 @@ fi | |||
3364 | 3427 | ||
3365 | 3428 | ||
3366 | if test $pkg_failed = yes; then | 3429 | if test $pkg_failed = yes; then |
3367 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 3430 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3368 | $as_echo "no" >&6; } | 3431 | $as_echo "no" >&6; } |
3369 | 3432 | ||
3370 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 3433 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
@@ -3391,7 +3454,7 @@ Alternatively, you may set the environment variables AA_CFLAGS | |||
3391 | and AA_LIBS to avoid the need to call pkg-config. | 3454 | and AA_LIBS to avoid the need to call pkg-config. |
3392 | See the pkg-config man page for more details." "$LINENO" 5 | 3455 | See the pkg-config man page for more details." "$LINENO" 5 |
3393 | elif test $pkg_failed = untried; then | 3456 | elif test $pkg_failed = untried; then |
3394 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 3457 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3395 | $as_echo "no" >&6; } | 3458 | $as_echo "no" >&6; } |
3396 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 3459 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3397 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 3460 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
@@ -3433,6 +3496,19 @@ if test "x$enable_overlayfs" != "xno"; then : | |||
3433 | 3496 | ||
3434 | fi | 3497 | fi |
3435 | 3498 | ||
3499 | HAVE_FIRETUNNEL="" | ||
3500 | # Check whether --enable-firetunnel was given. | ||
3501 | if test "${enable_firetunnel+set}" = set; then : | ||
3502 | enableval=$enable_firetunnel; | ||
3503 | fi | ||
3504 | |||
3505 | if test "x$enable_firetunnel" != "xno"; then : | ||
3506 | |||
3507 | HAVE_FIRETUNNEL="-DHAVE_FIRETUNNEL" | ||
3508 | |||
3509 | |||
3510 | fi | ||
3511 | |||
3436 | HAVE_PRIVATEHOME="" | 3512 | HAVE_PRIVATEHOME="" |
3437 | # Check whether --enable-private-home was given. | 3513 | # Check whether --enable-private-home was given. |
3438 | if test "${enable_private_home+set}" = set; then : | 3514 | if test "${enable_private_home+set}" = set; then : |
@@ -5280,6 +5356,7 @@ echo " whitelisting: $HAVE_WHITELIST" | |||
5280 | echo " private home support: $HAVE_PRIVATE_HOME" | 5356 | echo " private home support: $HAVE_PRIVATE_HOME" |
5281 | echo " file transfer support: $HAVE_FILE_TRANSFER" | 5357 | echo " file transfer support: $HAVE_FILE_TRANSFER" |
5282 | echo " overlayfs support: $HAVE_OVERLAYFS" | 5358 | echo " overlayfs support: $HAVE_OVERLAYFS" |
5359 | echo " firetunnel support: $HAVE_FIRETUNNEL" | ||
5283 | echo " busybox workaround: $BUSYBOX_WORKAROUND" | 5360 | echo " busybox workaround: $BUSYBOX_WORKAROUND" |
5284 | echo " Spectre compiler patch: $HAVE_SPECTRE" | 5361 | echo " Spectre compiler patch: $HAVE_SPECTRE" |
5285 | echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" | 5362 | echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" |