diff options
author | startx2017 <vradu.startx@yandex.com> | 2018-07-27 12:56:41 -0400 |
---|---|---|
committer | startx2017 <vradu.startx@yandex.com> | 2018-07-27 12:56:41 -0400 |
commit | 3cf75fe9a34c0bb579502b106649a1fc58d39f35 (patch) | |
tree | 3c696691a48205e6c73987f562bcc7a80aac69e4 /configure.ac | |
parent | compile time marker for LTS code (diff) | |
download | firejail-3cf75fe9a34c0bb579502b106649a1fc58d39f35.tar.gz firejail-3cf75fe9a34c0bb579502b106649a1fc58d39f35.tar.zst firejail-3cf75fe9a34c0bb579502b106649a1fc58d39f35.zip |
phase 1
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index ea569eb2f..9dc01bc8f 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -178,15 +178,6 @@ AS_IF([test "x$enable_gcov" = "xyes"], [ | |||
178 | AC_SUBST(HAVE_GCOV) | 178 | AC_SUBST(HAVE_GCOV) |
179 | ]) | 179 | ]) |
180 | 180 | ||
181 | HAVE_CONTRIB_INSTALL="yes" | ||
182 | AC_ARG_ENABLE([contrib-install], | ||
183 | AS_HELP_STRING([--enable-contrib-install], [install contrib scripts])) | ||
184 | AS_IF([test "x$enable_contrib_install" = "xno"], | ||
185 | [HAVE_CONTRIB_INSTALL="no"], | ||
186 | [HAVE_CONTRIB_INSTALL="yes"] | ||
187 | ) | ||
188 | AC_SUBST(HAVE_CONTRIB_INSTALL) | ||
189 | |||
190 | # checking pthread library | 181 | # checking pthread library |
191 | AC_CHECK_LIB([pthread], [main], [], AC_MSG_ERROR([*** POSIX thread support not installed ***])) | 182 | AC_CHECK_LIB([pthread], [main], [], AC_MSG_ERROR([*** POSIX thread support not installed ***])) |
192 | AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([*** POSIX thread support not installed ***])) | 183 | AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([*** POSIX thread support not installed ***])) |
@@ -199,8 +190,8 @@ if test "$prefix" = /usr; then | |||
199 | fi | 190 | fi |
200 | 191 | ||
201 | AC_OUTPUT(Makefile src/common.mk src/lib/Makefile src/fcopy/Makefile src/fnet/Makefile src/firejail/Makefile src/fnetfilter/Makefile \ | 192 | AC_OUTPUT(Makefile src/common.mk src/lib/Makefile src/fcopy/Makefile src/fnet/Makefile src/firejail/Makefile src/fnetfilter/Makefile \ |
202 | src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile src/fbuilder/Makefile src/fsec-print/Makefile \ | 193 | src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile src/fsec-print/Makefile \ |
203 | src/ftee/Makefile src/faudit/Makefile src/fseccomp/Makefile src/fldd/Makefile src/libpostexecseccomp/Makefile src/fsec-optimize/Makefile) | 194 | src/ftee/Makefile src/fseccomp/Makefile src/libpostexecseccomp/Makefile src/fsec-optimize/Makefile) |
204 | 195 | ||
205 | echo | 196 | echo |
206 | echo "Configuration options:" | 197 | echo "Configuration options:" |
@@ -225,6 +216,5 @@ echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" | |||
225 | echo " EXTRA_CFLAGS: $EXTRA_CFLAGS" | 216 | echo " EXTRA_CFLAGS: $EXTRA_CFLAGS" |
226 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" | 217 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" |
227 | echo " Gcov instrumentation: $HAVE_GCOV" | 218 | echo " Gcov instrumentation: $HAVE_GCOV" |
228 | echo " Install contrib scripts: $HAVE_CONTRIB_INSTALL" | ||
229 | echo " Install as a SUID executable: $HAVE_SUID" | 219 | echo " Install as a SUID executable: $HAVE_SUID" |
230 | echo | 220 | echo |