diff options
| author | Shirish Pargaonkar <shirishpargaonkar@gmail.com> | 2011-08-25 14:16:23 -0400 |
|---|---|---|
| committer | Jeff Layton <jlayton@samba.org> | 2011-08-25 14:16:23 -0400 |
| commit | 06678a909ee842193b95b140fb198f85e3addfef (patch) | |
| tree | fed4cb2982f502a4e82acc11357162963e7419e9 /aclocal/idmap.m4 | |
| parent | 5ee1ac229d3738520d308e4ddcd170b9b5026ceb (diff) | |
| download | cifs-utils-06678a909ee842193b95b140fb198f85e3addfef.tar.gz cifs-utils-06678a909ee842193b95b140fb198f85e3addfef.tar.bz2 cifs-utils-06678a909ee842193b95b140fb198f85e3addfef.zip | |
cifsacl: Add configure and make directives for cifsacl (try #2)
Add configure directives for option cifsacl. The default action is
to enable cifsacl option.
cifsacl option is enabled or disabled in a similar way to cifs.idmap
in the same function. In addition, for cifsacl, check for sys/xattr.h
is done in the smae .m4 file.
Add directives to build getcifsacl in Makefile.
Signed-off-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
Diffstat (limited to 'aclocal/idmap.m4')
| -rw-r--r-- | aclocal/idmap.m4 | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/aclocal/idmap.m4 b/aclocal/idmap.m4 index 211d372..ada73f0 100644 --- a/aclocal/idmap.m4 +++ b/aclocal/idmap.m4 @@ -23,10 +23,10 @@ AC_DEFUN([AC_WBCH_COMPL],[ #endif ]]) -dnl Check for wbclient.h header and libwbclietn.so +dnl Check for wbclient.h header and libwbclient.so dnl AC_DEFUN([AC_TEST_WBCHL],[ -if test $enable_cifsidmap != "no"; then +if test $enable_cifsidmap != "no" -o $enable_cifsacl != "no"; then AC_CHECK_HEADERS([wbclient.h], , [ if test "$enable_cifsidmap" = "yes"; then AC_MSG_ERROR([wbclient.h not found, consider installing libwbclient-devel.]) @@ -34,10 +34,27 @@ if test $enable_cifsidmap != "no"; then AC_MSG_WARN([wbclient.h not found, consider installing libwbclient-devel. Disabling cifs.idmap.]) enable_cifsidmap="no" fi + if test "$enable_cifsacl" = "yes"; then + AC_MSG_ERROR([wbclient.h not found, consider installing libwbclient-devel.]) + else + AC_MSG_WARN([wbclient.h not found, consider installing libwbclient-devel. Disabling cifsacl.]) + enable_cifsacl="no" + fi ], [ AC_WBCH_COMPL ]) fi -if test $enable_cifsidmap != "no"; then +if test $enable_cifsacl != "no"; then + AC_CHECK_HEADERS([sys/xattr.h], , [ + if test "$enable_cifsacl" = "yes"; then + AC_MSG_ERROR([/usr/include/sys/xattr.h not found]) + else + AC_MSG_WARN([/usr/include/sys/xattr.h not found. Disabling cifsacl.]) + enable_cifsacl="no" + fi + ], [ ]) +fi + +if test $enable_cifsidmap != "no" -o $enable_cifsacl != "no"; then AC_CHECK_LIB([wbclient], [wbcStringToSid], [ WINB_LDADD='-lwbclient' ] [ AC_DEFINE(HAVE_LIBWBCLIENT, 1, ["Define var have_libwbclient"]) ], [AC_MSG_ERROR([No functioning wbclient library found!])]) AC_SUBST(WINB_LDADD) |