packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix --enable_rofiles_fuse=no build 

Closes: #276
Approved by: cgwalters
This commit is contained in:
Gatis Paeglis 2016-04-25 13:57:03 +02:00 committed by Colin Walters (automation)
parent f2fd1f50e2
commit ad0de186bb
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -71,7 +71,9 @@ include Makefile-otutil.am
include Makefile-libostree.am include Makefile-libostree.am
include Makefile-ostree.am include Makefile-ostree.am
include Makefile-switchroot.am include Makefile-switchroot.am
if BUILDOPT_FUSE
include src/rofiles-fuse/Makefile-inc.am include src/rofiles-fuse/Makefile-inc.am
endif
include Makefile-tests.am include Makefile-tests.am
include Makefile-boot.am include Makefile-boot.am
include Makefile-man.am include Makefile-man.am

2
configure.ac
View File

@ -222,7 +222,7 @@ AC_ARG_ENABLE(rofiles-fuse,
[AS_HELP_STRING([--enable-rofiles-fuse], [AS_HELP_STRING([--enable-rofiles-fuse],
[generate rofiles-fuse helper [default=yes]])],, [generate rofiles-fuse helper [default=yes]])],,
enable_rofiles_fuse=yes) enable_rofiles_fuse=yes)
AS_IF([ test $enable_rofiles_fuse != xno ], [ AS_IF([ test x$enable_rofiles_fuse != xno ], [
PKG_CHECK_MODULES(BUILDOPT_FUSE, $FUSE_DEPENDENCY) PKG_CHECK_MODULES(BUILDOPT_FUSE, $FUSE_DEPENDENCY)
], [enable_rofiles_fuse=no]) ], [enable_rofiles_fuse=no])
AM_CONDITIONAL(BUILDOPT_FUSE, test x$enable_rofiles_fuse = xyes) AM_CONDITIONAL(BUILDOPT_FUSE, test x$enable_rofiles_fuse = xyes)