diff options
author | 2017-02-28 19:57:25 +0100 | |
---|---|---|
committer | 2017-02-28 19:57:25 +0100 | |
commit | 0890a915daf92ef2e37bb28be3d887e699ec1de2 (patch) | |
tree | 785bfa9d2eded39c3df72f00071d1abedb5cec90 /configure | |
parent | remove redundancy (diff) | |
parent | profile merges (diff) | |
download | firejail-0890a915daf92ef2e37bb28be3d887e699ec1de2.tar.gz firejail-0890a915daf92ef2e37bb28be3d887e699ec1de2.tar.zst firejail-0890a915daf92ef2e37bb28be3d887e699ec1de2.zip |
Merge pull request #2 from netblue30/master
merge upstream
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 20 |
1 files changed, 18 insertions, 2 deletions
@@ -625,6 +625,7 @@ ac_includes_default="\ | |||
625 | ac_subst_vars='LTLIBOBJS | 625 | ac_subst_vars='LTLIBOBJS |
626 | LIBOBJS | 626 | LIBOBJS |
627 | HAVE_SECCOMP_H | 627 | HAVE_SECCOMP_H |
628 | HAVE_GIT_INSTALL | ||
628 | HAVE_GCOV | 629 | HAVE_GCOV |
629 | BUSYBOX_WORKAROUND | 630 | BUSYBOX_WORKAROUND |
630 | HAVE_FATAL_WARNINGS | 631 | HAVE_FATAL_WARNINGS |
@@ -711,6 +712,7 @@ enable_whitelist | |||
711 | enable_fatal_warnings | 712 | enable_fatal_warnings |
712 | enable_busybox_workaround | 713 | enable_busybox_workaround |
713 | enable_gcov | 714 | enable_gcov |
715 | enable_git_install | ||
714 | ' | 716 | ' |
715 | ac_precious_vars='build_alias | 717 | ac_precious_vars='build_alias |
716 | host_alias | 718 | host_alias |
@@ -1349,6 +1351,7 @@ Optional Features: | |||
1349 | --enable-busybox-workaround | 1351 | --enable-busybox-workaround |
1350 | enable busybox workaround | 1352 | enable busybox workaround |
1351 | --enable-gcov Gcov instrumentation | 1353 | --enable-gcov Gcov instrumentation |
1354 | --enable-git-install enable git install feature | ||
1352 | 1355 | ||
1353 | Some influential environment variables: | 1356 | Some influential environment variables: |
1354 | CC C compiler command | 1357 | CC C compiler command |
@@ -3100,6 +3103,7 @@ if test "x$enable_apparmor" = "xyes"; then : | |||
3100 | fi | 3103 | fi |
3101 | 3104 | ||
3102 | 3105 | ||
3106 | |||
3103 | ac_ext=c | 3107 | ac_ext=c |
3104 | ac_cpp='$CPP $CPPFLAGS' | 3108 | ac_cpp='$CPP $CPPFLAGS' |
3105 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 3109 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
@@ -3711,6 +3715,18 @@ if test "x$enable_gcov" = "xyes"; then : | |||
3711 | fi | 3715 | fi |
3712 | 3716 | ||
3713 | 3717 | ||
3718 | HAVE_GIT_INSTALL="" | ||
3719 | # Check whether --enable-git-install was given. | ||
3720 | if test "${enable_git_install+set}" = set; then : | ||
3721 | enableval=$enable_git_install; | ||
3722 | fi | ||
3723 | |||
3724 | if test "x$enable_git_install" = "xyes"; then : | ||
3725 | |||
3726 | HAVE_GIT_INSTALL="-DHAVE_GIT_INSTALL" | ||
3727 | |||
3728 | |||
3729 | fi | ||
3714 | 3730 | ||
3715 | # checking pthread library | 3731 | # checking pthread library |
3716 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5 | 3732 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5 |
@@ -3777,7 +3793,7 @@ if test "$prefix" = /usr; then | |||
3777 | sysconfdir="/etc" | 3793 | sysconfdir="/etc" |
3778 | fi | 3794 | fi |
3779 | 3795 | ||
3780 | ac_config_files="$ac_config_files Makefile src/lib/Makefile src/fcopy/Makefile src/fnet/Makefile src/firejail/Makefile src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile src/ftee/Makefile src/faudit/Makefile src/libconnect/Makefile src/fseccomp/Makefile" | 3796 | ac_config_files="$ac_config_files Makefile src/lib/Makefile src/fcopy/Makefile src/fnet/Makefile src/firejail/Makefile src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile src/ftee/Makefile src/faudit/Makefile src/fseccomp/Makefile" |
3781 | 3797 | ||
3782 | cat >confcache <<\_ACEOF | 3798 | cat >confcache <<\_ACEOF |
3783 | # This file is a shell script that caches the results of configure | 3799 | # This file is a shell script that caches the results of configure |
@@ -4497,7 +4513,6 @@ do | |||
4497 | "src/firecfg/Makefile") CONFIG_FILES="$CONFIG_FILES src/firecfg/Makefile" ;; | 4513 | "src/firecfg/Makefile") CONFIG_FILES="$CONFIG_FILES src/firecfg/Makefile" ;; |
4498 | "src/ftee/Makefile") CONFIG_FILES="$CONFIG_FILES src/ftee/Makefile" ;; | 4514 | "src/ftee/Makefile") CONFIG_FILES="$CONFIG_FILES src/ftee/Makefile" ;; |
4499 | "src/faudit/Makefile") CONFIG_FILES="$CONFIG_FILES src/faudit/Makefile" ;; | 4515 | "src/faudit/Makefile") CONFIG_FILES="$CONFIG_FILES src/faudit/Makefile" ;; |
4500 | "src/libconnect/Makefile") CONFIG_FILES="$CONFIG_FILES src/libconnect/Makefile" ;; | ||
4501 | "src/fseccomp/Makefile") CONFIG_FILES="$CONFIG_FILES src/fseccomp/Makefile" ;; | 4516 | "src/fseccomp/Makefile") CONFIG_FILES="$CONFIG_FILES src/fseccomp/Makefile" ;; |
4502 | 4517 | ||
4503 | *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; | 4518 | *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; |
@@ -4971,6 +4986,7 @@ echo " whitelisting: $HAVE_WHITELIST" | |||
4971 | echo " private home support: $HAVE_PRIVATE_HOME" | 4986 | echo " private home support: $HAVE_PRIVATE_HOME" |
4972 | echo " file transfer support: $HAVE_FILE_TRANSFER" | 4987 | echo " file transfer support: $HAVE_FILE_TRANSFER" |
4973 | echo " overlayfs support: $HAVE_OVERLAYFS" | 4988 | echo " overlayfs support: $HAVE_OVERLAYFS" |
4989 | echo " git install support: $HAVE_GIT_INSTALL" | ||
4974 | echo " busybox workaround: $BUSYBOX_WORKAROUND" | 4990 | echo " busybox workaround: $BUSYBOX_WORKAROUND" |
4975 | echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" | 4991 | echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" |
4976 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" | 4992 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" |