regress: in acl-xattr-test check if client is linked with libacl

diff --git a/regress/tests/acl-xattr-test b/regress/tests/acl-xattr-test
index 2d09add5cd9963192cab6e6b86f45fcd39ddb26e..88375ac1d81bd2fca6d8e714050c5cd4f9263f1c 100755 (executable)
--- a/regress/tests/acl-xattr-test
+++ b/regress/tests/acl-xattr-test
@@ -49,6 +49,13 @@ case `uname -s` in
         echo "$TestName skipped: getfattr not installed"
         exit 0
       fi
+
+      # Require bacula-fd to be linked with libacl else check the configure ouput
+      ldd ${bin}/bacula-fd | grep libacl 2>&1 >/dev/null
+      if test $? -ne 0; then
+        echo "$TestName skipped: client is not linked with libacl"
+        exit 0
+      fi
       ;;
    Darwin)
       ;;
@@ -93,8 +100,8 @@ scripts/copy-confs
 outf="tmp/sed_tmp"
 echo "s%  Schedule =%# Schedule =%g" > $outf
 echo "s/Options {/Options { aclsupport=yes; xattrsupport = yes/" >> $outf
-cp ${cwd}/bin/bacula-dir.conf  $cwd/tmp/1
-sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf
+cp ${conf}/bacula-dir.conf  $cwd/tmp/1
+sed -f ${outf} ${cwd}/tmp/1 >${conf}/bacula-dir.conf
 
 d=${cwd}/build/acl