diff options
author | 2017-04-13 18:50:49 +0200 | |
---|---|---|
committer | 2017-04-13 18:51:49 +0200 | |
commit | 8d8686af26be5d06af681a492ed3a134fb638c56 (patch) | |
tree | e74223895e3f8d364da969b66578255022169a8f | |
parent | Remove debug print (diff) | |
download | firejail-8d8686af2.tar.gz firejail-8d8686af2.tar.zst firejail-8d8686af2.zip |
Make installation of contrib scripts configurable
-rw-r--r-- | Makefile.in | 4 | ||||
-rwxr-xr-x | configure | 19 | ||||
-rw-r--r-- | configure.ac | 10 |
3 files changed, 33 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index d5c40ebb6..93c91ced2 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -17,6 +17,8 @@ NAME=@PACKAGE_NAME@ | |||
17 | PACKAGE_TARNAME=@PACKAGE_TARNAME@ | 17 | PACKAGE_TARNAME=@PACKAGE_TARNAME@ |
18 | DOCDIR=@docdir@ | 18 | DOCDIR=@docdir@ |
19 | HAVE_APPARMOR=@HAVE_APPARMOR@ | 19 | HAVE_APPARMOR=@HAVE_APPARMOR@ |
20 | HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@ | ||
21 | HAVE_GIT_INSTALL=@HAVE_GIT_INSTALL@ | ||
20 | BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@ | 22 | BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@ |
21 | 23 | ||
22 | uids.h:; ./mkuid.sh | 24 | uids.h:; ./mkuid.sh |
@@ -94,11 +96,13 @@ endif | |||
94 | install -c -m 0644 seccomp.debug $(DESTDIR)/$(libdir)/firejail/. | 96 | install -c -m 0644 seccomp.debug $(DESTDIR)/$(libdir)/firejail/. |
95 | install -c -m 0644 seccomp.i386 $(DESTDIR)/$(libdir)/firejail/. | 97 | install -c -m 0644 seccomp.i386 $(DESTDIR)/$(libdir)/firejail/. |
96 | install -c -m 0644 seccomp.amd64 $(DESTDIR)/$(libdir)/firejail/. | 98 | install -c -m 0644 seccomp.amd64 $(DESTDIR)/$(libdir)/firejail/. |
99 | ifeq($(HAVE_CONTRIB_INSTALL),yes) | ||
97 | install -c -m 0755 contrib/fix_private-bin.py $(DESTDIR)/$(libdir)/firejail/. | 100 | install -c -m 0755 contrib/fix_private-bin.py $(DESTDIR)/$(libdir)/firejail/. |
98 | install -c -m 0755 contrib/fjclip.py $(DESTDIR)/$(libdir)/firejail/. | 101 | install -c -m 0755 contrib/fjclip.py $(DESTDIR)/$(libdir)/firejail/. |
99 | install -c -m 0755 contrib/fjdisplay.py $(DESTDIR)/$(libdir)/firejail/. | 102 | install -c -m 0755 contrib/fjdisplay.py $(DESTDIR)/$(libdir)/firejail/. |
100 | install -c -m 0755 contrib/fjresize.py $(DESTDIR)/$(libdir)/firejail/. | 103 | install -c -m 0755 contrib/fjresize.py $(DESTDIR)/$(libdir)/firejail/. |
101 | install -c -m 0755 contrib/fj-mkdeb.py $(DESTDIR)/$(libdir)/firejail/. | 104 | install -c -m 0755 contrib/fj-mkdeb.py $(DESTDIR)/$(libdir)/firejail/. |
105 | endif | ||
102 | # documents | 106 | # documents |
103 | install -m 0755 -d $(DESTDIR)/$(DOCDIR) | 107 | install -m 0755 -d $(DESTDIR)/$(DOCDIR) |
104 | install -c -m 0644 COPYING $(DESTDIR)/$(DOCDIR)/. | 108 | install -c -m 0644 COPYING $(DESTDIR)/$(DOCDIR)/. |
@@ -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 | ||
diff --git a/configure.ac b/configure.ac index 164ecab4f..c6048ca61 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -155,6 +155,15 @@ AS_IF([test "x$enable_git_install" = "xyes"], [ | |||
155 | AC_SUBST(HAVE_GIT_INSTALL) | 155 | AC_SUBST(HAVE_GIT_INSTALL) |
156 | ]) | 156 | ]) |
157 | 157 | ||
158 | HAVE_CONTRIB_INSTALL="yes" | ||
159 | AC_ARG_ENABLE([contrib-install], | ||
160 | AS_HELP_STRING([--enable-contrib-install], [install contrib scripts])) | ||
161 | AS_IF([test "x$enable_contrib_install" = "xno"], | ||
162 | [HAVE_CONTRIB_INSTALL="no"], | ||
163 | [HAVE_CONTRIB_INSTALL="yes"] | ||
164 | ) | ||
165 | AC_SUBST(HAVE_CONTRIB_INSTALL) | ||
166 | |||
158 | # checking pthread library | 167 | # checking pthread library |
159 | AC_CHECK_LIB([pthread], [main], [], AC_MSG_ERROR([*** POSIX thread support not installed ***])) | 168 | AC_CHECK_LIB([pthread], [main], [], AC_MSG_ERROR([*** POSIX thread support not installed ***])) |
160 | AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([*** POSIX thread support not installed ***])) | 169 | AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([*** POSIX thread support not installed ***])) |
@@ -192,6 +201,7 @@ echo " busybox workaround: $BUSYBOX_WORKAROUND" | |||
192 | echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" | 201 | echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" |
193 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" | 202 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" |
194 | echo " Gcov instrumentation: $HAVE_GCOV" | 203 | echo " Gcov instrumentation: $HAVE_GCOV" |
204 | echo " Install contrib scripts: $HAVE_CONTRIB_INSTALL" | ||
195 | echo | 205 | echo |
196 | 206 | ||
197 | 207 | ||