summaryrefslogtreecommitdiff
path: root/source4/ntvfs/posix
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-04-26 12:22:54 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:05:00 -0500
commit0d5587b5d128d9dd502a3b78c02fb986b33d92c4 (patch)
treed5165c0eaf4424edaefca4422319afe84d4c7852 /source4/ntvfs/posix
parent7ffe0fcaee413de96ec9c3d4fdeaab6c2f106578 (diff)
downloadsamba-0d5587b5d128d9dd502a3b78c02fb986b33d92c4.tar.gz
samba-0d5587b5d128d9dd502a3b78c02fb986b33d92c4.tar.bz2
samba-0d5587b5d128d9dd502a3b78c02fb986b33d92c4.zip
r15274: Drop default EXT_LIB_ prefix for external libraries. Fixes issues with local
(empty) libpopt.a overriding global one (This used to be commit 2f06305e53478e5030c24550954f221a9a97c83f)
Diffstat (limited to 'source4/ntvfs/posix')
-rw-r--r--source4/ntvfs/posix/config.m44
-rw-r--r--source4/ntvfs/posix/config.mk2
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/ntvfs/posix/config.m4 b/source4/ntvfs/posix/config.m4
index 37c2b57cf1..8d8b07810c 100644
--- a/source4/ntvfs/posix/config.m4
+++ b/source4/ntvfs/posix/config.m4
@@ -30,7 +30,7 @@ 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_ext_flistxattr" = x"yes"; then
AC_DEFINE(HAVE_XATTR_SUPPORT,1,[Whether we have xattr support])
- SMB_EXT_LIB_ENABLE(XATTR,YES)
+ SMB_ENABLE(XATTR,YES)
fi
AC_CHECK_HEADERS(blkid/blkid.h)
@@ -39,5 +39,5 @@ 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_ext_blkid_get_cache" = x"yes"; then
AC_DEFINE(HAVE_LIBBLKID,1,[Whether we have blkid support (e2fsprogs)])
- SMB_EXT_LIB_ENABLE(BLKID,YES)
+ SMB_ENABLE(BLKID,YES)
fi
diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk
index b3c6a54904..32ede78cc9 100644
--- a/source4/ntvfs/posix/config.mk
+++ b/source4/ntvfs/posix/config.mk
@@ -32,6 +32,6 @@ OBJ_FILES = \
pvfs_notify.o \
xattr_system.o \
xattr_tdb.o
-PUBLIC_DEPENDENCIES = NDR_XATTR EXT_LIB_XATTR EXT_LIB_BLKID ntvfs_common
+PUBLIC_DEPENDENCIES = NDR_XATTR XATTR BLKID ntvfs_common
# End MODULE ntvfs_posix
################################################