aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Reiner Herrmann <reiner@reiner-h.de>2020-10-10 21:05:59 +0200
committerLibravatar Reiner Herrmann <reiner@reiner-h.de>2020-10-10 21:07:11 +0200
commit7fb7e4227ee756387f3f038ec2bbc8b844664a60 (patch)
treed70dd3e387bff26bca47a39eb2619e0b1a8d58cd
parentMerge pull request #3660 from kris7t/apparmor-run (diff)
downloadfirejail-7fb7e4227ee756387f3f038ec2bbc8b844664a60.tar.gz
firejail-7fb7e4227ee756387f3f038ec2bbc8b844664a60.tar.zst
firejail-7fb7e4227ee756387f3f038ec2bbc8b844664a60.zip
build: check for presence of gawk when manpages will be built
Fixes: #3661
-rwxr-xr-xconfigure50
-rw-r--r--configure.ac2
2 files changed, 48 insertions, 4 deletions
diff --git a/configure b/configure
index a4f678f28..79315754c 100755
--- a/configure
+++ b/configure
@@ -642,6 +642,7 @@ HAVE_GLOBALCFG
642HAVE_CHROOT 642HAVE_CHROOT
643HAVE_PRIVATE_HOME 643HAVE_PRIVATE_HOME
644HAVE_FIRETUNNEL 644HAVE_FIRETUNNEL
645HAVE_GAWK
645HAVE_MAN 646HAVE_MAN
646HAVE_OVERLAYFS 647HAVE_OVERLAYFS
647HAVE_DBUSPROXY 648HAVE_DBUSPROXY
@@ -3416,8 +3417,8 @@ if test "x$enable_apparmor" = "xyes"; then :
3416 HAVE_APPARMOR="-DHAVE_APPARMOR" 3417 HAVE_APPARMOR="-DHAVE_APPARMOR"
3417 3418
3418pkg_failed=no 3419pkg_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
3422if test -n "$AA_CFLAGS"; then 3423if 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
3459if test $pkg_failed = yes; then 3460if 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
3463if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 3464if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -3484,7 +3485,7 @@ Alternatively, you may set the environment variables AA_CFLAGS
3484and AA_LIBS to avoid the need to call pkg-config. 3485and AA_LIBS to avoid the need to call pkg-config.
3485See the pkg-config man page for more details." "$LINENO" 5 3486See the pkg-config man page for more details." "$LINENO" 5
3486elif test $pkg_failed = untried; then 3487elif 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.
3554set 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; }
3557if ${ac_cv_prog_HAVE_GAWK+:} false; then :
3558 $as_echo_n "(cached) " >&6
3559else
3560 if test -n "$HAVE_GAWK"; then
3561 ac_cv_prog_HAVE_GAWK="$HAVE_GAWK" # Let the user override the test.
3562else
3563as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3564for as_dir in $PATH
3565do
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
3574done
3575 done
3576IFS=$as_save_IFS
3577
3578 test -z "$ac_cv_prog_HAVE_GAWK" && ac_cv_prog_HAVE_GAWK="no"
3579fi
3580fi
3581HAVE_GAWK=$ac_cv_prog_HAVE_GAWK
3582if test -n "$HAVE_GAWK"; then
3583 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_GAWK" >&5
3584$as_echo "$HAVE_GAWK" >&6; }
3585else
3586 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3587$as_echo "no" >&6; }
3588fi
3589
3590
3591 if test "x$HAVE_GAWK" != "xyes"; then :
3592 as_fn_error $? "\"*** gawk not found ***\"" "$LINENO" 5
3593fi
3552 3594
3553fi 3595fi
3554 3596
diff --git a/configure.ac b/configure.ac
index 4ba1a8ae6..45f7c6207 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,6 +80,8 @@ AC_ARG_ENABLE([man],
80AS_IF([test "x$enable_man" != "xno"], [ 80AS_IF([test "x$enable_man" != "xno"], [
81 HAVE_MAN="-DHAVE_MAN" 81 HAVE_MAN="-DHAVE_MAN"
82 AC_SUBST(HAVE_MAN) 82 AC_SUBST(HAVE_MAN)
83 AC_CHECK_PROG([HAVE_GAWK], [gawk], [yes], [no])
84 AS_IF([test "x$HAVE_GAWK" != "xyes"], [AC_MSG_ERROR("*** gawk not found ***")])
83]) 85])
84 86
85HAVE_FIRETUNNEL="" 87HAVE_FIRETUNNEL=""