github-starred/firejail
2
0
Fork 0
mirror of https://github.com/netblue30/firejail.git synced 2026-05-15 14:16:14 -06:00
Code Issues 531 Projects Packages Wiki Activity Actions 6

replaced --enable-man with --disable-man in ./configure

Browse source
This commit is contained in:
netblue30 2020-10-03 09:25:04 -04:00
parent bbf10833d5
commit 228be74d59
3 changed files with 50 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Makefile.in
View file

@ -14,9 +14,9 @@ HAVE_APPARMOR=@HAVE_APPARMOR@
HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@
BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@
HAVE_SUID=@HAVE_SUID@
NEED_MAN=@NEED_MAN@
HAVE_MAN=@HAVE_MAN@
ifneq ($(NEED_MAN),no)
ifneq ($(HAVE_MAN),no)
MAN_TARGET = man
MAN_SRC = src/man
endif
@ -139,7 +139,7 @@ ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR)
# install apparmor profile customization file
sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/apparmor.d/local/firejail-default ]; then install -c -m 0644 etc/apparmor/firejail-local $(DESTDIR)/$(sysconfdir)/apparmor.d/local/firejail-default; fi;"
endif
ifneq ($(NEED_MAN),no)
ifneq ($(HAVE_MAN),no)
# man pages
install -m 0755 -d $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5
for man in $(MANPAGES); do \

73
configure vendored
View file

@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for firejail 0.9.63.
# Generated by GNU Autoconf 2.69 for firejail 0.9.64.rc1.
#
# Report bugs to <netblue30@yahoo.com>.
# Report bugs to <netblue30@protonmail.com>.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@ -267,10 +267,10 @@ fi
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf@gnu.org and
$0: netblue30@yahoo.com about your system, including any
$0: error possibly output before this message. Then install
$0: a modern shell, or manually run the script under such a
$0: shell if you do have one."
$0: netblue30@protonmail.com about your system, including
$0: any error possibly output before this message. Then
$0: install a modern shell, or manually run the script
$0: under such a shell if you do have one."
fi
exit 1
fi
@ -580,9 +580,9 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='firejail'
PACKAGE_TARNAME='firejail'
PACKAGE_VERSION='0.9.63'
PACKAGE_STRING='firejail 0.9.63'
PACKAGE_BUGREPORT='netblue30@yahoo.com'
PACKAGE_VERSION='0.9.64.rc1'
PACKAGE_STRING='firejail 0.9.64.rc1'
PACKAGE_BUGREPORT='netblue30@protonmail.com'
PACKAGE_URL='https://firejail.wordpress.com'
ac_unique_file="src/firejail/main.c"
@ -630,7 +630,6 @@ CPP
HAVE_SELINUX
HAVE_CONTRIB_INSTALL
HAVE_GCOV
NEED_MAN
BUSYBOX_WORKAROUND
HAVE_FATAL_WARNINGS
HAVE_SUID
@ -643,6 +642,7 @@ HAVE_GLOBALCFG
HAVE_CHROOT
HAVE_PRIVATE_HOME
HAVE_FIRETUNNEL
HAVE_MAN
HAVE_OVERLAYFS
HAVE_DBUSPROXY
EXTRA_LDFLAGS
@ -710,6 +710,7 @@ enable_analyzer
enable_apparmor
enable_dbusproxy
enable_overlayfs
enable_man
enable_firetunnel
enable_private_home
enable_chroot
@ -722,7 +723,6 @@ enable_whitelist
enable_suid
enable_fatal_warnings
enable_busybox_workaround
enable_man
enable_gcov
enable_contrib_install
enable_selinux
@ -1291,7 +1291,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures firejail 0.9.63 to adapt to many kinds of systems.
\`configure' configures firejail 0.9.64.rc1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1353,7 +1353,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of firejail 0.9.63:";;
short | recursive ) echo "Configuration of firejail 0.9.64.rc1:";;
esac
cat <<\_ACEOF
@ -1365,6 +1365,7 @@ Optional Features:
--enable-apparmor enable apparmor
--disable-dbusproxy disable dbus proxy
--disable-overlayfs disable overlayfs
--disable-man disable man pages
--disable-firetunnel disable firetunnel
--disable-private-home disable private home feature
--disable-chroot disable chroot
@ -1379,7 +1380,6 @@ Optional Features:
--enable-fatal-warnings -W -Wall -Werror
--enable-busybox-workaround
enable busybox workaround
--enable-man generate and install man pages
--enable-gcov Gcov instrumentation
--enable-contrib-install
install contrib scripts
@ -1405,7 +1405,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to <netblue30@yahoo.com>.
Report bugs to <netblue30@protonmail.com>.
firejail home page: <https://firejail.wordpress.com>.
_ACEOF
ac_status=$?
@ -1469,7 +1469,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
firejail configure 0.9.63
firejail configure 0.9.64.rc1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -1674,9 +1674,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
( $as_echo "## ---------------------------------- ##
## Report this to netblue30@yahoo.com ##
## ---------------------------------- ##"
( $as_echo "## --------------------------------------- ##
## Report this to netblue30@protonmail.com ##
## --------------------------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@ -1771,7 +1771,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by firejail $as_me 0.9.63, which was
It was created by firejail $as_me 0.9.64.rc1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -3537,6 +3537,19 @@ if test "x$enable_overlayfs" != "xno"; then :
HAVE_OVERLAYFS="-DHAVE_OVERLAYFS"
fi
HAVE_MAN="no"
# Check whether --enable-man was given.
if test "${enable_man+set}" = set; then :
enableval=$enable_man;
fi
if test "x$enable_man" != "xno"; then :
HAVE_MAN="-DHAVE_MAN"
fi
HAVE_FIRETUNNEL=""
@ -3696,18 +3709,6 @@ if test "x$enable_busybox_workaround" = "xyes"; then :
fi
NEED_MAN="yes"
# Check whether --enable-man was given.
if test "${enable_man+set}" = set; then :
enableval=$enable_man;
fi
if test "x$enable_man" = "xno"; then :
NEED_MAN="no"
fi
HAVE_GCOV=""
# Check whether --enable-gcov was given.
@ -4758,7 +4759,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by firejail $as_me 0.9.63, which was
This file was extended by firejail $as_me 0.9.64.rc1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -4805,14 +4806,14 @@ Usage: $0 [OPTION]... [TAG]...
Configuration files:
$config_files
Report bugs to <netblue30@yahoo.com>.
Report bugs to <netblue30@protonmail.com>.
firejail home page: <https://firejail.wordpress.com>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
firejail config.status 0.9.63
firejail config.status 0.9.64.rc1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@ -5420,6 +5421,7 @@ echo " private home support: $HAVE_PRIVATE_HOME"
echo " file transfer support: $HAVE_FILE_TRANSFER"
echo " overlayfs support: $HAVE_OVERLAYFS"
echo " DBUS proxy support: $HAVE_DBUSPROXY"
echo " Manpage support: $HAVE_MAN"
echo " firetunnel support: $HAVE_FIRETUNNEL"
echo " busybox workaround: $BUSYBOX_WORKAROUND"
echo " Spectre compiler patch: $HAVE_SPECTRE"
@ -5427,7 +5429,6 @@ echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS"
echo " EXTRA_CFLAGS: $EXTRA_CFLAGS"
echo " fatal warnings: $HAVE_FATAL_WARNINGS"
echo " Gcov instrumentation: $HAVE_GCOV"
echo " Generate and install man pages: $NEED_MAN"
echo " Install contrib scripts: $HAVE_CONTRIB_INSTALL"
echo " SELinux labeling support: $HAVE_SELINUX"
echo " Install as a SUID executable: $HAVE_SUID"

11
configure.ac
View file

@ -12,7 +12,7 @@
#
AC_PREREQ([2.68])
AC_INIT(firejail, 0.9.63, netblue30@yahoo.com, , https://firejail.wordpress.com)
AC_INIT(firejail, 0.9.64.rc1, netblue30@protonmail.com, , https://firejail.wordpress.com)
AC_CONFIG_SRCDIR([src/firejail/main.c])
AC_CONFIG_MACRO_DIR([m4])
@ -74,6 +74,14 @@ AS_IF([test "x$enable_overlayfs" != "xno"], [
AC_SUBST(HAVE_OVERLAYFS)
])
HAVE_MAN="no"
AC_ARG_ENABLE([man],
AS_HELP_STRING([--disable-man], [disable man pages]))
AS_IF([test "x$enable_man" != "xno"], [
HAVE_MAN="-DHAVE_MAN"
AC_SUBST(HAVE_MAN)
])
HAVE_FIRETUNNEL=""
AC_ARG_ENABLE([firetunnel],
AS_HELP_STRING([--disable-firetunnel], [disable firetunnel]))
@ -230,6 +238,7 @@ echo " private home support: $HAVE_PRIVATE_HOME"
echo " file transfer support: $HAVE_FILE_TRANSFER"
echo " overlayfs support: $HAVE_OVERLAYFS"
echo " DBUS proxy support: $HAVE_DBUSPROXY"
echo " Manpage support: $HAVE_MAN"
echo " firetunnel support: $HAVE_FIRETUNNEL"
echo " busybox workaround: $BUSYBOX_WORKAROUND"
echo " Spectre compiler patch: $HAVE_SPECTRE"