marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Require bubblewrap 0.1.2 for system bwrap and update git submodule to that

tingping/wmclass
Alexander Larsson 2016-09-09 09:07:15 +02:00
parent 96f383198d
commit a46f8ed1d3
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bubblewrap

@ -1 +1 @@
Subproject commit 6355ffbd9c8a6089565e9cb0f234cb07121cd9c1
Subproject commit 089327ddcfafe7520967196393025a72081bec0b

10
configure.ac
View File

@ -29,6 +29,7 @@ AC_INIT([Flatpak],
[http://flatpak.org/])
GLIB_REQS=2.40
SYSTEM_BWRAP_REQS=0.1.2
AC_USE_SYSTEM_EXTENSIONS
@ -112,7 +113,14 @@ AS_CASE([$BWRAP],
[BWRAP=false],
[auto],
[AC_CHECK_PROG([BWRAP], [bwrap], [bwrap], [false])])
AM_CONDITIONAL([WITH_SYSTEM_BWRAP], [test "x$BWRAP" != xfalse])
if test "x$BWRAP" != xfalse; then
BWRAP_VERSION=`$BWRAP --version | sed 's,.*\ \([0-9]*\.[0-9]*\.[0-9]*\)$,\1,'`
AX_COMPARE_VERSION([$SYSTEM_BWRAP_REQS],[gt],[$BWRAP_VERSION],
AC_MSG_ERROR([You need at least version $SYSTEM_BWRAP_REQS of bubblewrap to use the system installed version]))
AM_CONDITIONAL([WITH_SYSTEM_BWRAP], [true])
else
AM_CONDITIONAL([WITH_SYSTEM_BWRAP], [false])
fi
AC_CHECK_FUNCS(fdwalk)