diff options
author | Reiner Herrmann <reiner@reiner-h.de> | 2020-10-10 21:05:59 +0200 |
---|---|---|
committer | Reiner Herrmann <reiner@reiner-h.de> | 2020-10-10 21:07:11 +0200 |
commit | 7fb7e4227ee756387f3f038ec2bbc8b844664a60 (patch) | |
tree | d70dd3e387bff26bca47a39eb2619e0b1a8d58cd /configure | |
parent | Merge pull request #3660 from kris7t/apparmor-run (diff) | |
download | firejail-7fb7e4227ee756387f3f038ec2bbc8b844664a60.tar.gz firejail-7fb7e4227ee756387f3f038ec2bbc8b844664a60.tar.zst firejail-7fb7e4227ee756387f3f038ec2bbc8b844664a60.zip |
build: check for presence of gawk when manpages will be built
Fixes: #3661
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 50 |
1 files changed, 46 insertions, 4 deletions
@@ -642,6 +642,7 @@ HAVE_GLOBALCFG | |||
642 | HAVE_CHROOT | 642 | HAVE_CHROOT |
643 | HAVE_PRIVATE_HOME | 643 | HAVE_PRIVATE_HOME |
644 | HAVE_FIRETUNNEL | 644 | HAVE_FIRETUNNEL |
645 | HAVE_GAWK | ||
645 | HAVE_MAN | 646 | HAVE_MAN |
646 | HAVE_OVERLAYFS | 647 | HAVE_OVERLAYFS |
647 | HAVE_DBUSPROXY | 648 | HAVE_DBUSPROXY |
@@ -3416,8 +3417,8 @@ if test "x$enable_apparmor" = "xyes"; then : | |||
3416 | HAVE_APPARMOR="-DHAVE_APPARMOR" | 3417 | HAVE_APPARMOR="-DHAVE_APPARMOR" |
3417 | 3418 | ||
3418 | pkg_failed=no | 3419 | pkg_failed=no |
3419 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AA" >&5 | 3420 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libapparmor" >&5 |
3420 | $as_echo_n "checking for AA... " >&6; } | 3421 | $as_echo_n "checking for libapparmor... " >&6; } |
3421 | 3422 | ||
3422 | if test -n "$AA_CFLAGS"; then | 3423 | if test -n "$AA_CFLAGS"; then |
3423 | pkg_cv_AA_CFLAGS="$AA_CFLAGS" | 3424 | pkg_cv_AA_CFLAGS="$AA_CFLAGS" |
@@ -3457,7 +3458,7 @@ fi | |||
3457 | 3458 | ||
3458 | 3459 | ||
3459 | if test $pkg_failed = yes; then | 3460 | if test $pkg_failed = yes; then |
3460 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 3461 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3461 | $as_echo "no" >&6; } | 3462 | $as_echo "no" >&6; } |
3462 | 3463 | ||
3463 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 3464 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
@@ -3484,7 +3485,7 @@ Alternatively, you may set the environment variables AA_CFLAGS | |||
3484 | and AA_LIBS to avoid the need to call pkg-config. | 3485 | and AA_LIBS to avoid the need to call pkg-config. |
3485 | See the pkg-config man page for more details." "$LINENO" 5 | 3486 | See the pkg-config man page for more details." "$LINENO" 5 |
3486 | elif test $pkg_failed = untried; then | 3487 | elif test $pkg_failed = untried; then |
3487 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 3488 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3488 | $as_echo "no" >&6; } | 3489 | $as_echo "no" >&6; } |
3489 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 3490 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3490 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 3491 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
@@ -3549,6 +3550,47 @@ if test "x$enable_man" != "xno"; then : | |||
3549 | 3550 | ||
3550 | HAVE_MAN="-DHAVE_MAN" | 3551 | HAVE_MAN="-DHAVE_MAN" |
3551 | 3552 | ||
3553 | # Extract the first word of "gawk", so it can be a program name with args. | ||
3554 | set dummy gawk; ac_word=$2 | ||
3555 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
3556 | $as_echo_n "checking for $ac_word... " >&6; } | ||
3557 | if ${ac_cv_prog_HAVE_GAWK+:} false; then : | ||
3558 | $as_echo_n "(cached) " >&6 | ||
3559 | else | ||
3560 | if test -n "$HAVE_GAWK"; then | ||
3561 | ac_cv_prog_HAVE_GAWK="$HAVE_GAWK" # Let the user override the test. | ||
3562 | else | ||
3563 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
3564 | for as_dir in $PATH | ||
3565 | do | ||
3566 | IFS=$as_save_IFS | ||
3567 | test -z "$as_dir" && as_dir=. | ||
3568 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
3569 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
3570 | ac_cv_prog_HAVE_GAWK="yes" | ||
3571 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
3572 | break 2 | ||
3573 | fi | ||
3574 | done | ||
3575 | done | ||
3576 | IFS=$as_save_IFS | ||
3577 | |||
3578 | test -z "$ac_cv_prog_HAVE_GAWK" && ac_cv_prog_HAVE_GAWK="no" | ||
3579 | fi | ||
3580 | fi | ||
3581 | HAVE_GAWK=$ac_cv_prog_HAVE_GAWK | ||
3582 | if test -n "$HAVE_GAWK"; then | ||
3583 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_GAWK" >&5 | ||
3584 | $as_echo "$HAVE_GAWK" >&6; } | ||
3585 | else | ||
3586 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
3587 | $as_echo "no" >&6; } | ||
3588 | fi | ||
3589 | |||
3590 | |||
3591 | if test "x$HAVE_GAWK" != "xyes"; then : | ||
3592 | as_fn_error $? "\"*** gawk not found ***\"" "$LINENO" 5 | ||
3593 | fi | ||
3552 | 3594 | ||
3553 | fi | 3595 | fi |
3554 | 3596 | ||