Commit df2b70f6 by Paweł Wegner

fuse: moved to bin/.

parent 7d1871a3
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src test
SUBDIRS = src test bin
if EXAMPLES
SUBDIRS += examples
......
ACLOCAL_AMFLAGS = -I m4
if WITH_CURL
if WITH_MICROHTTPD
if WITH_FUSE
SUBDIRS = fuse
endif
endif
endif
......@@ -69,6 +69,19 @@ AS_IF([test "x$with_microhttpd" != "xno"], [
])
AM_CONDITIONAL([WITH_MICROHTTPD], [test "$HAVE_MICROHTTPD" -eq 1])
HAVE_FUSE=0
AC_ARG_WITH([fuse], AS_HELP_STRING([--with-fuse]))
AS_IF([test "x$with_fuse" != "xno"], [
PKG_CHECK_MODULES([fuse], [fuse3], [
HAVE_FUSE=1
AC_DEFINE(WITH_FUSE)
], [
HAVE_FUSE=0
AS_IF([test "x$with_fuse" = "xyes"], [AC_MSG_ERROR([fuse3 not found])])
])
])
AM_CONDITIONAL([WITH_FUSE], [test "$HAVE_FUSE" -eq 1])
case "${host_os}" in
*mingw32*)
SYS=mingw32
......@@ -83,10 +96,11 @@ AC_CONFIG_FILES([
src/libcloudstorage.pc
src/Makefile
test/Makefile
bin/Makefile
bin/fuse/Makefile
examples/Makefile
examples/cloudbrowser/Makefile
examples/commandlinebrowser/Makefile
examples/fuse/Makefile
])
SOCKET_LIBS=""
......@@ -110,7 +124,6 @@ AM_CONDITIONAL([WITH_QMLPLAYER], [test "x$with_qmlplayer" = "xyes"])
HAVE_QT=0
HAVE_QTWEBENGINE=0
HAVE_THUMBNAILER=0
HAVE_FUSE=0
AS_IF([test "x$with_examples" = "xyes"], [
PKG_CHECK_MODULES([qt], [Qt5Core Qt5Gui Qt5Quick], [
......@@ -142,15 +155,10 @@ AS_IF([test "x$with_examples" = "xyes"], [
PKG_CHECK_MODULES([qtmultimedia], [Qt5Multimedia], [HAVE_QT=0])
AC_DEFINE(WITH_QMLPLAYER)
])
PKG_CHECK_MODULES([fuse], [fuse3], [
HAVE_FUSE=1
AC_DEFINE(WITH_FUSE)
], [HAVE_FUSE=0])
])
AM_CONDITIONAL([WITH_QT], [test "$HAVE_QT" -eq 1])
AM_CONDITIONAL([WITH_QTWEBENGINE], [test "$HAVE_QTWEBENGINE" -eq 1])
AM_CONDITIONAL([WITH_THUMBNAILER], [test "$HAVE_THUMBNAILER" -eq 1])
AM_CONDITIONAL([WITH_FUSE], [test "$HAVE_FUSE" -eq 1])
AC_OUTPUT
......@@ -9,9 +9,5 @@ if WITH_QT
SUBDIRS += cloudbrowser
endif
if WITH_FUSE
SUBDIRS += fuse
endif
endif
endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment