svn commit: samba r22820 - in branches/SAMBA_3_0/source: .
jpeach at samba.org
jpeach at samba.org
Sun May 13 04:08:27 GMT 2007
Author: jpeach
Date: 2007-05-13 04:08:26 +0000 (Sun, 13 May 2007)
New Revision: 22820
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22820
Log:
Move FAM libraries from smbd to vfs_fam_notify. Should fix bugzilla #4426.
Modified:
branches/SAMBA_3_0/source/Makefile.in
branches/SAMBA_3_0/source/configure.in
Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0/source/Makefile.in 2007-05-12 19:53:47 UTC (rev 22819)
+++ branches/SAMBA_3_0/source/Makefile.in 2007-05-13 04:08:26 UTC (rev 22820)
@@ -1620,7 +1620,7 @@
bin/notify_fam. at 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. at SHLIBEXT@: $(VFS_READAHEAD_OBJ)
@echo "Building plugin $@"
Modified: branches/SAMBA_3_0/source/configure.in
===================================================================
--- branches/SAMBA_3_0/source/configure.in 2007-05-12 19:53:47 UTC (rev 22819)
+++ branches/SAMBA_3_0/source/configure.in 2007-05-13 04:08:26 UTC (rev 22820)
@@ -2645,13 +2645,13 @@
# 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 @@
fi
fi
+AC_SUBST(SMB_FAM_LIBS)
+
#################################################
# Check for DMAPI interfaces in libdm/libjfsdm/libxsdm
@@ -6376,7 +6378,7 @@
# 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)
More information about the samba-cvs
mailing list