+FUSE interface skeleton.

[captive.git] / configure.in

diff --git a/configure.in b/configure.in
index 0321cf3..2db614c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,7 @@ dnl 2.53 for AM_GLIB_GNU_GETTEXT:
 AC_PREREQ(2.53)
 dnl Not yet present in: Red Hat autoconf-2.57-3
 dnl AC_CONFIG_MACRO_DIR(macros)
-AM_INIT_AUTOMAKE(captive,1.1.1.2cvs)
+AM_INIT_AUTOMAKE(captive,1.1.6cvs)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 dnl Call AC_PROG_CC before AC_ISC_POSIX.
@@ -91,7 +91,9 @@ AC_ARG_ENABLE(sandbox-chroot,
 AC_ARG_ENABLE(bug-replay,
                [  --enable-bug-replay=no/yes/auto  compile debugging tool (def.=auto)],,enable_bug_replay=auto)
 AC_ARG_ENABLE(lufs,
-               [  --enable-lufs=no/yes/auto        compile LUFS filesystem module (def.=auto)],,enable_lufs=auto)
+               [  --enable-lufs=no/yes/auto        compile LUFS filesystem module - DEPRECATED (def.=no)],,enable_lufs=no)
+AC_ARG_ENABLE(fuse,
+               [  --enable-fuse=no/yes/auto        compile FUSE filesystem module (def.=auto)],,enable_fuse=auto)
 AC_ARG_ENABLE(install-pkg,
                [  --enable-install-pkg=no/yes/auto compile installation utils (def.=auto)],,enable_install_pkg=auto)
 
@@ -106,10 +108,12 @@ AC_SUBST(enable_sbin_mount_fs)
 # AC_ARG_ENABLE(sandbox-setuid,[--enable-sandbox-setuid=USER],,[CAPTIVE_SANDBOX_SETUID="captive"])
 AC_DEFINE_UNQUOTED(CAPTIVE_SANDBOX_SETUID,"$CAPTIVE_SANDBOX_SETUID",
                [non-privileged user  for captive-sandbox-server])
+AC_SUBST(CAPTIVE_SANDBOX_SETUID)
 
 # AC_ARG_ENABLE(sandbox-setgid,[--enable-sandbox-setgid=GROUP],,[CAPTIVE_SANDBOX_SETGID="captive"])
 AC_DEFINE_UNQUOTED(CAPTIVE_SANDBOX_SETGID,"$CAPTIVE_SANDBOX_SETGID",
                [non-privileged group for captive-sandbox-server])
+AC_SUBST(CAPTIVE_SANDBOX_SETGID)
 
 # AC_ARG_ENABLE(sandbox-chroot,[--enable-sandbox-chroot=DIR],,[CAPTIVE_SANDBOX_CHROOT="/var/lib/captive"])
 AC_DEFINE_UNQUOTED(CAPTIVE_SANDBOX_CHROOT,"$CAPTIVE_SANDBOX_CHROOT",
@@ -309,13 +313,13 @@ PKG_CHECK_MODULES(OPENSSL,openssl,,[
 AC_SUBST(OPENSSL_CFLAGS)
 AC_SUBST(OPENSSL_LIBS)
 
-# AC_ARG_ENABLE(lufs,[--enable-lufs=[no/yes/auto]],,enable_lufs=auto)
+# AC_ARG_ENABLE(lufs,[--enable-lufs=[no/yes/auto]],,enable_lufs=no)
 have_lufs_includes=false
 # Although it would be more appropriate to use lufsmount(1) instead of lufsd(1)
 # we use lufsd(1) as lufsmount(1) is just a dumb wrapper and it would cost us
 # another big binary file for the static build package version.
 PATH_LUFSD=""
-if test x$enable_lufs != no;then
+if test x$enable_lufs != xno;then
        have_lufs_includes=true
        dnl If ACTION-IF-NOT-FOUND is given, it is executed when one of the header
        dnl files is not found.
@@ -345,8 +349,33 @@ if test x$enable_lufs != no;then
        fi
 fi
 AM_CONDITIONAL(ENABLE_LUFS,[ $have_lufs_includes && test x$PATH_LUFSD != x -a x$enable_lufs != no ])
+if test x$ENABLE_LUFS_TRUE = x;then
+       AC_MSG_WARN([LUFS client is going to be compiled - LUFS is deprecated, FUSE module is recommended instead.])
+fi
 AC_SUBST(PATH_LUFSD)
 
+# AC_ARG_ENABLE(fuse,[--enable-fuse=[no/yes/auto]],,enable_fuse=auto)
+have_fuse=false
+if test x$enable_fuse != xno;then
+       PKG_CHECK_MODULES(FUSE,fuse,[ have_fuse=true ],[
+               if test x$enable_fuse = xyes;then
+                       AC_MSG_ERROR([FUSE client was requested (--enable-fuse) but no FUSE pkg-config(1) module was found. Install 'fuse-devel' package.])
+               else
+                       AC_MSG_WARN([FUSE client not being compiled as no FUSE pkg-config(1) module was found. Install 'fuse-devel' package.])
+               fi
+               ])
+fi
+AM_CONDITIONAL(ENABLE_FUSE,[ $have_fuse ])
+# Avoid default backward compatibility mode - see the heading of: <fuse.h>
+FUSE_CFLAGS="$FUSE_CFLAGS -DFUSE_USE_VERSION=22"
+AC_SUBST(FUSE_CFLAGS)
+AC_SUBST(FUSE_LIBS)
+
+if test x$ENABLE_LUFS_TRUE = x -a x$ENABLE_FUSE_TRUE = x;then
+       # mount.captive(8) file installation would conflict, that's all.
+       AC_MSG_ERROR([Compilation of both FUSE and LUFS modules is currently not supported - use '--disable-lufs'.])
+fi
+
 dnl for $(top_srcdir)/src/libcaptive/client/
 dnl Do not use '[client server]' as $4 to prevent: configure: test: too many arguments
 dnl  - currently this argument is not used by 'orbit2-config' in any way anyway
@@ -516,6 +545,7 @@ Makefile
 ./src/client/cmdline/Makefile
 ./src/client/gnomevfs/Makefile
 ./src/client/lufs/Makefile
+./src/client/fuse/Makefile
 ./src/client/sandbox-server/Makefile
 ./src/install/Makefile
 ./src/install/libcaptive-install/Makefile