GTK_DOC_CHECK
dnl AM_CONDITIONAL needs to be here explicitely for doc/apiref/Makefile rebuild
AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
dnl Do not discard 'CFLAGS' settings as they may have been passed us by rpmbuild(8)
dnl Some Makefiles use additional tests etc.
AM_CONDITIONAL(MAINTAINER_MODE,[test "$USE_MAINTAINER_MODE" = "yes"])
+
+AC_ARG_WITH(sbin-mountdir,
+ [ --with-sbin-mountdir=dir mount(8) 'mount.captive' directory (def.=/sbin)],,
+ [ with_sbin_mountdir="/sbin" ])
+AM_CONDITIONAL(WITH_SBIN_MOUNT,[test "$with_sbin_mount" != "no"])
+AC_SUBST(with_sbin_mountdir)
+
+AC_ARG_WITH(sbin-mount-fs,
+ [ --with-sbin-mount-fs=fs1:fs2 sbin-mount pre-installed symlinks (def.=ntfs:fastfat:cdfs:ext2fsd)],,
+ [ with_sbin_mount_fs="ntfs:fastfat:cdfs:ext2fsd" ])
+AC_SUBST(with_sbin_mount_fs)
+
AC_ARG_WITH(sandbox-setuid,
[ --with-sandbox-setuid=user non-privileged user for captive-sandbox-server (def.=captive)],
[ CAPTIVE_SANDBOX_SETUID="$withval" ],[ CAPTIVE_SANDBOX_SETUID="captive" ])
[ CAPTIVE_SANDBOX_CHROOT="$withval" ],[ CAPTIVE_SANDBOX_CHROOT="/var/lib/captive" ])
AC_DEFINE_UNQUOTED(CAPTIVE_SANDBOX_CHROOT,"$CAPTIVE_SANDBOX_CHROOT",
[root-owned directory for captive-sandbox-server])
+AC_SUBST(CAPTIVE_SANDBOX_CHROOT)
-dnl Permit 'if IS_FALSE' for Makefile.am-s; symbol 'FALSE' forbidden by automake
-AM_CONDITIONAL(IS_FALSE,false)
+dnl Permit 'if NEVER' for Makefile.am-s; symbol 'FALSE' forbidden by automake
+AM_CONDITIONAL(NEVER,false)
dnl Separate 'acconfig.h' is no longer recommended by autoconf
AH_TOP([
AC_CHECK_LIB(popt,poptParseArgvString,[POPT_LIBS="-lpopt"],[AC_MSG_ERROR([Captive requires popt library.])])
AC_SUBST(POPT_LIBS)
-AC_ARG_WITH(readline, [ --with-readline=[no/yes/auto] cmdline client w/line editing [default=auto]],,with_readline=auto)
+AC_ARG_WITH(readline, [ --with-readline=[no/yes/auto] cmdline client with line editing (def.=auto)],,with_readline=auto)
AC_CHECK_HEADERS(readline/history.h)
dnl Check for libraries, if needed by configuration options.
if test "$with_readline" != "no"
AC_SUBST(OPENSSL_CFLAGS)
AC_SUBST(OPENSSL_LIBS)
+have_lufs_includes=true
+AC_CHECK_HEADERS(lufs/fs.h lufs/proto.h,,[ have_lufs_includes=false ])
+AM_CONDITIONAL(HAVE_LUFS_INCLUDES,$have_lufs_includes)
+AC_CHECK_TYPES([struct lufs_sbattr],,,[#include <lufs/proto.h>])
+
dnl for $(top_srcdir)/src/libcaptive/sandbox/split-sandbox.c
AM_PATH_LINC(,,[AC_MSG_ERROR([Captive requires linc library used by ORBit.])])
dnl "Makefile" output files MUST have pathnames incl./excl. "./" prefix as specified!
AC_OUTPUT([
-captive.spec
-Makefile
-./macros/Makefile
+./captive.spec
+./src/client/gnomevfs/captive.conf
+./src/client/lufs/mount.captive
./po/Makefile.in
+./Makefile
+./macros/Makefile
./src/Makefile
./src/libcaptive/Makefile
./src/libcaptive/include/Makefile
./src/TraceFS/Makefile
./doc/Makefile
./doc/apiref/Makefile
-./src/client/gnomevfs/captive.conf
])
dnl FIXME: Why is "po/POTFILES" being substituted?