summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2007-05-13 04:08:26 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:22:00 -0500
commit2a5d612f34cc6d604916a05e3f26a6cfaf47d7a9 (patch)
treeb3446ee967030007f7be26e4c45f2baca872c703 /source3
parent8190e0466330fbdfb1beed7a073122c752d7fa31 (diff)
downloadsamba-2a5d612f34cc6d604916a05e3f26a6cfaf47d7a9.tar.gz
samba-2a5d612f34cc6d604916a05e3f26a6cfaf47d7a9.tar.bz2
samba-2a5d612f34cc6d604916a05e3f26a6cfaf47d7a9.zip
r22820: Move FAM libraries from smbd to vfs_fam_notify. Should fix bugzilla #4426.
(This used to be commit 9d9950a6d10675c3568179312ff27289d3f9b340)
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in2
-rw-r--r--source3/configure.in8
2 files changed, 6 insertions, 4 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index e7494d7031..926e4f75cf 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1620,7 +1620,7 @@ bin/gpfs.@SHLIBEXT@: $(VFS_GPFS_OBJ)
bin/notify_fam.@SHLIBEXT@: $(VFS_NOTIFY_FAM_OBJ)
@echo "Building plugin $@"
- @$(SHLD_MODULE) $(VFS_NOTIFY_FAM_OBJ)
+ @$(SHLD_MODULE) $(VFS_NOTIFY_FAM_OBJ) @SMB_FAM_LIBS@
bin/readahead.@SHLIBEXT@: $(VFS_READAHEAD_OBJ)
@echo "Building plugin $@"
diff --git a/source3/configure.in b/source3/configure.in
index 718baed302..863496a096 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2645,13 +2645,13 @@ if test x$enable_fam != xno; then
# On IRIX, libfam requires libC, but other FAM implementations
# might not need it.
AC_CHECK_LIB(fam, FAMOpen2,
- [samba_cv_HAVE_LIBFAM=yes; samba_fam_libs="-lfam"],
+ [samba_cv_HAVE_LIBFAM=yes; SMB_FAM_LIBS="-lfam"],
[samba_cv_HAVE_LIBFAM=no])
if test x"$samba_cv_HAVE_LIBFAM" = x"no" ; then
samba_fam_xtra=-lC
AC_CHECK_LIB_EXT(fam, samba_fam_xtra, FAMOpen2,
- [samba_cv_HAVE_LIBFAM=yes; samba_fam_libs="-lfam -lC"],
+ [samba_cv_HAVE_LIBFAM=yes; SMB_FAM_LIBS="-lfam -lC"],
[samba_cv_HAVE_LIBFAM=no])
unset samba_fam_xtra
fi
@@ -2671,6 +2671,8 @@ if test x$enable_fam != xno; then
fi
fi
+AC_SUBST(SMB_FAM_LIBS)
+
#################################################
# Check for DMAPI interfaces in libdm/libjfsdm/libxsdm
@@ -6376,7 +6378,7 @@ AC_SUBST(builddir)
# Stuff the smbd-only libraries at the end of the smbd link
# path (if we have them).
-SMBD_LIBS="$samba_fam_libs $samba_dmapi_libs"
+SMBD_LIBS="$samba_dmapi_libs"
AC_SUBST(SMBD_LIBS)
AC_OUTPUT(include/stamp-h Makefile script/findsmb smbadduser script/gen-8bit-gap.sh script/installbin.sh script/uninstallbin.sh)