diff options
author | 2017-02-28 19:57:25 +0100 | |
---|---|---|
committer | 2017-02-28 19:57:25 +0100 | |
commit | 0890a915daf92ef2e37bb28be3d887e699ec1de2 (patch) | |
tree | 785bfa9d2eded39c3df72f00071d1abedb5cec90 /configure.ac | |
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.ac')
-rw-r--r-- | configure.ac | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index f3076f2f8..c04bfed89 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -17,6 +17,7 @@ AS_IF([test "x$enable_apparmor" = "xyes"], [ | |||
17 | AC_SUBST(HAVE_APPARMOR) | 17 | AC_SUBST(HAVE_APPARMOR) |
18 | ]) | 18 | ]) |
19 | 19 | ||
20 | |||
20 | AS_IF([test "x$enable_apparmor" = "xyes"], [ | 21 | AS_IF([test "x$enable_apparmor" = "xyes"], [ |
21 | AC_CHECK_HEADER(sys/apparmor.h, , [AC_MSG_ERROR( | 22 | AC_CHECK_HEADER(sys/apparmor.h, , [AC_MSG_ERROR( |
22 | [Couldn't find sys/apparmor.h... please install apparmor user space library and development files] )]) | 23 | [Couldn't find sys/apparmor.h... please install apparmor user space library and development files] )]) |
@@ -146,6 +147,13 @@ AS_IF([test "x$enable_gcov" = "xyes"], [ | |||
146 | ]) | 147 | ]) |
147 | 148 | ||
148 | 149 | ||
150 | HAVE_GIT_INSTALL="" | ||
151 | AC_ARG_ENABLE([git-install], | ||
152 | AS_HELP_STRING([--enable-git-install], [enable git install feature])) | ||
153 | AS_IF([test "x$enable_git_install" = "xyes"], [ | ||
154 | HAVE_GIT_INSTALL="-DHAVE_GIT_INSTALL" | ||
155 | AC_SUBST(HAVE_GIT_INSTALL) | ||
156 | ]) | ||
149 | 157 | ||
150 | # checking pthread library | 158 | # checking pthread library |
151 | AC_CHECK_LIB([pthread], [main], [], AC_MSG_ERROR([*** POSIX thread support not installed ***])) | 159 | AC_CHECK_LIB([pthread], [main], [], AC_MSG_ERROR([*** POSIX thread support not installed ***])) |
@@ -160,7 +168,7 @@ fi | |||
160 | 168 | ||
161 | AC_OUTPUT(Makefile src/lib/Makefile src/fcopy/Makefile src/fnet/Makefile src/firejail/Makefile \ | 169 | AC_OUTPUT(Makefile src/lib/Makefile src/fcopy/Makefile src/fnet/Makefile src/firejail/Makefile \ |
162 | src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile \ | 170 | src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile \ |
163 | src/ftee/Makefile src/faudit/Makefile src/libconnect/Makefile src/fseccomp/Makefile) | 171 | src/ftee/Makefile src/faudit/Makefile src/fseccomp/Makefile) |
164 | 172 | ||
165 | echo | 173 | echo |
166 | echo "Configuration options:" | 174 | echo "Configuration options:" |
@@ -179,6 +187,7 @@ echo " whitelisting: $HAVE_WHITELIST" | |||
179 | echo " private home support: $HAVE_PRIVATE_HOME" | 187 | echo " private home support: $HAVE_PRIVATE_HOME" |
180 | echo " file transfer support: $HAVE_FILE_TRANSFER" | 188 | echo " file transfer support: $HAVE_FILE_TRANSFER" |
181 | echo " overlayfs support: $HAVE_OVERLAYFS" | 189 | echo " overlayfs support: $HAVE_OVERLAYFS" |
190 | echo " git install support: $HAVE_GIT_INSTALL" | ||
182 | echo " busybox workaround: $BUSYBOX_WORKAROUND" | 191 | echo " busybox workaround: $BUSYBOX_WORKAROUND" |
183 | echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" | 192 | echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" |
184 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" | 193 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" |