diff options
author | Reiner Herrmann <reiner@reiner-h.de> | 2017-04-13 18:50:49 +0200 |
---|---|---|
committer | Reiner Herrmann <reiner@reiner-h.de> | 2017-04-13 18:51:49 +0200 |
commit | 8d8686af26be5d06af681a492ed3a134fb638c56 (patch) | |
tree | e74223895e3f8d364da969b66578255022169a8f /configure | |
parent | Remove debug print (diff) | |
download | firejail-8d8686af26be5d06af681a492ed3a134fb638c56.tar.gz firejail-8d8686af26be5d06af681a492ed3a134fb638c56.tar.zst firejail-8d8686af26be5d06af681a492ed3a134fb638c56.zip |
Make installation of contrib scripts configurable
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 19 |
1 files changed, 19 insertions, 0 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_CONTRIB_INSTALL | ||
628 | HAVE_GIT_INSTALL | 629 | HAVE_GIT_INSTALL |
629 | HAVE_GCOV | 630 | HAVE_GCOV |
630 | BUSYBOX_WORKAROUND | 631 | BUSYBOX_WORKAROUND |
@@ -713,6 +714,7 @@ enable_fatal_warnings | |||
713 | enable_busybox_workaround | 714 | enable_busybox_workaround |
714 | enable_gcov | 715 | enable_gcov |
715 | enable_git_install | 716 | enable_git_install |
717 | enable_contrib_install | ||
716 | ' | 718 | ' |
717 | ac_precious_vars='build_alias | 719 | ac_precious_vars='build_alias |
718 | host_alias | 720 | host_alias |
@@ -1352,6 +1354,8 @@ Optional Features: | |||
1352 | enable busybox workaround | 1354 | enable busybox workaround |
1353 | --enable-gcov Gcov instrumentation | 1355 | --enable-gcov Gcov instrumentation |
1354 | --enable-git-install enable git install feature | 1356 | --enable-git-install enable git install feature |
1357 | --enable-contrib-install | ||
1358 | install contrib scripts | ||
1355 | 1359 | ||
1356 | Some influential environment variables: | 1360 | Some influential environment variables: |
1357 | CC C compiler command | 1361 | CC C compiler command |
@@ -3728,6 +3732,20 @@ if test "x$enable_git_install" = "xyes"; then : | |||
3728 | 3732 | ||
3729 | fi | 3733 | fi |
3730 | 3734 | ||
3735 | HAVE_CONTRIB_INSTALL="yes" | ||
3736 | # Check whether --enable-contrib-install was given. | ||
3737 | if test "${enable_contrib_install+set}" = set; then : | ||
3738 | enableval=$enable_contrib_install; | ||
3739 | fi | ||
3740 | |||
3741 | if test "x$enable_contrib_install" = "xno"; then : | ||
3742 | HAVE_CONTRIB_INSTALL="no" | ||
3743 | else | ||
3744 | HAVE_CONTRIB_INSTALL="yes" | ||
3745 | |||
3746 | fi | ||
3747 | |||
3748 | |||
3731 | # checking pthread library | 3749 | # checking pthread library |
3732 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5 | 3750 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5 |
3733 | $as_echo_n "checking for main in -lpthread... " >&6; } | 3751 | $as_echo_n "checking for main in -lpthread... " >&6; } |
@@ -4991,6 +5009,7 @@ echo " busybox workaround: $BUSYBOX_WORKAROUND" | |||
4991 | echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" | 5009 | echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" |
4992 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" | 5010 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" |
4993 | echo " Gcov instrumentation: $HAVE_GCOV" | 5011 | echo " Gcov instrumentation: $HAVE_GCOV" |
5012 | echo " Install contrib scripts: $HAVE_CONTRIB_INSTALL" | ||
4994 | echo | 5013 | echo |
4995 | 5014 | ||
4996 | 5015 | ||