Detect lufsmount(1) pathname for better crossplatform compatibility.

diff --git a/configure.in b/configure.in
index aa64345..a850de3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -302,6 +302,8 @@ AC_SUBST(OPENSSL_CFLAGS)
 AC_SUBST(OPENSSL_LIBS)
 
 # AC_ARG_ENABLE(lufs,[--enable-lufs=[no/yes/auto]],,enable_lufs=auto)
+have_lufs_includes=false
+PATH_LUFSMOUNT=""
 if test x$enable_lufs != no;then
        have_lufs_includes=true
        dnl If ACTION-IF-NOT-FOUND is given, it is executed when one of the header
@@ -322,8 +324,17 @@ if test x$enable_lufs != no;then
                        AC_MSG_WARN([Although LUFS include files were found they are too old. df(1) will not show available NTFS disk space.])
                fi
                ],[#include <lufs/proto.h>])
+       AC_PATH_PROGS(PATH_LUFSMOUNT,lufsmount)
+       if test x$PATH_LUFSMOUNT = x;then
+               if test x$enable_lufs = xyes;then
+                       AC_MSG_ERROR([LUFS client was requested (--enable-lufs) but no lufsmount(1) binary was found. Install 'lufs-*-*captive*' package.])
+               else
+                       AC_MSG_WARN([LUFS client not being compiled as no lufsmount(1) binary was found. Install 'lufs-*-*captive*' package.])
+               fi
+       fi
 fi
-AM_CONDITIONAL(ENABLE_LUFS,[ $have_lufs_includes && test x$enable_lufs != no ])
+AM_CONDITIONAL(ENABLE_LUFS,[ $have_lufs_includes && test x$PATH_LUFSMOUNT != x -a x$enable_lufs != no ])
+AC_SUBST(PATH_LUFSMOUNT)
 
 dnl for $(top_srcdir)/src/libcaptive/sandbox/split-sandbox.c
 AM_PATH_LINC(,,[AC_MSG_ERROR([Captive requires linc library used by ORBit.])])

diff --git a/src/client/lufs/mount.captive.in b/src/client/lufs/mount.captive.in
index 1c4d1bc..5bf664e 100755 (executable)
--- a/src/client/lufs/mount.captive.in
+++ b/src/client/lufs/mount.captive.in
@@ -28,9 +28,7 @@ use Getopt::Long;
 my $vardir='@localstatedir@/lib/captive';
 $vardir=~s#\$\Q{prefix}\E#'@prefix@';#ge;
 $vardir="/var/lib/captive" if $vardir=~/^@/;
-my $lufsmount_bin='@bindir@/lufsmount';
-$lufsmount_bin=~s#\$\Q{exec_prefix}\E#'@exec_prefix@';#ge;
-$lufsmount_bin=~s#\$\Q{prefix}\E#'@prefix@';#ge;
+my $lufsmount_bin='@PATH_LUFSMOUNT@';
 $lufsmount_bin="/usr/bin/lufsmount" if $lufsmount_bin=~/^@/;
 my $captive_sandbox_server_bin='@sbindir@/captive-sandbox-server';
 $captive_sandbox_server_bin=~s#\$\Q{exec_prefix}\E#'@exec_prefix@';#ge;