diff options
author | Stefan Metzmacher <metze@samba.org> | 2005-08-04 01:43:25 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:31:10 -0500 |
commit | 8e26f094338b4528ec82dda8b69f61f22c27258e (patch) | |
tree | a5526a70c78e7a48e1ac1c7069adc5c5c40e11d4 | |
parent | d8eb612fb9647be1492406d968829683d38d1947 (diff) | |
download | samba-8e26f094338b4528ec82dda8b69f61f22c27258e.tar.gz samba-8e26f094338b4528ec82dda8b69f61f22c27258e.tar.bz2 samba-8e26f094338b4528ec82dda8b69f61f22c27258e.zip |
r9031: don't use the global $LIBS variables for posix specific stuff
metze
(This used to be commit 51ab751c619bfa05a736853723f1aeda901a0b33)
-rw-r--r-- | source4/ntvfs/posix/config.m4 | 11 | ||||
-rw-r--r-- | source4/ntvfs/posix/config.mk | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/source4/ntvfs/posix/config.m4 b/source4/ntvfs/posix/config.m4 index 7625f8ee81..75ab531375 100644 --- a/source4/ntvfs/posix/config.m4 +++ b/source4/ntvfs/posix/config.m4 @@ -25,16 +25,17 @@ dnl ############################################ dnl use flistxattr as the key function for having dnl sufficient xattr support for posix xattr backend AC_CHECK_HEADERS(sys/attributes.h attr/xattr.h sys/xattr.h) -AC_SEARCH_LIBS(flistxattr, [attr]) -AC_CHECK_FUNCS(flistxattr) - +AC_SEARCH_LIBS_EXT(flistxattr, [attr], XATTR_LIBS) +AC_CHECK_FUNC_EXT(flistxattr, $XATTR_LIBS) +SMB_EXT_LIB(XATTR,[${XATTR_LIBS}],[${XATTR_CFLAGS}],[${XATTR_CPPFLAGS}],[${XATTR_LDFLAGS}]) if test x"$ac_cv_func_flistxattr" = x"yes"; then AC_DEFINE(HAVE_XATTR_SUPPORT,1,[Whether we have xattr support]) fi AC_CHECK_HEADERS(blkid/blkid.h) -AC_SEARCH_LIBS(blkid_get_cache, [blkid]) -AC_CHECK_FUNCS(blkid_get_cache) +AC_SEARCH_LIBS_EXT(blkid_get_cache, [blkid], BLKID_LIBS) +AC_CHECK_FUNC_EXT(blkid_get_cache, $BLKID_LIBS) +SMB_EXT_LIB(BLKID,[${BLKID_LIBS}],[${BLKID_CFLAGS}],[${BLKID_CPPFLAGS}],[${BLKID_LDFLAGS}]) if test x"$ac_cv_func_blkid_get_cache" = x"yes"; then AC_DEFINE(HAVE_LIBBLKID,1,[Whether we have blkid support (e2fsprogs)]) fi diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk index f2f7207773..9be3723056 100644 --- a/source4/ntvfs/posix/config.mk +++ b/source4/ntvfs/posix/config.mk @@ -31,6 +31,6 @@ ADD_OBJ_FILES = \ ntvfs/posix/pvfs_acl.o \ ntvfs/posix/xattr_system.o \ ntvfs/posix/xattr_tdb.o -REQUIRED_SUBSYSTEMS = NDR_XATTR ntvfs_common +REQUIRED_SUBSYSTEMS = NDR_XATTR ntvfs_common EXT_LIB_XATTR EXT_LIB_BLKID # End MODULE ntvfs_posix ################################################ |