diff options
| author | James Peach <jpeach@samba.org> | 2007-05-13 04:08:26 +0000 |
|---|---|---|
| committer | James Peach <jpeach@samba.org> | 2007-05-13 04:08:26 +0000 |
| commit | 2827f6aafe001db43dbed8f5b91fe72b0422a1f2 (patch) | |
| tree | 6c5a58d7508b3664f27b247907323737bd166b1e | |
| parent | bc0172baba092921a0f6d337aa0bf11f9fa938f7 (diff) | |
| download | samba-2827f6aafe001db43dbed8f5b91fe72b0422a1f2.tar.gz samba-2827f6aafe001db43dbed8f5b91fe72b0422a1f2.tar.xz samba-2827f6aafe001db43dbed8f5b91fe72b0422a1f2.zip | |
r22820: Move FAM libraries from smbd to vfs_fam_notify. Should fix bugzilla #4426.
| -rw-r--r-- | source/Makefile.in | 2 | ||||
| -rw-r--r-- | source/configure.in | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source/Makefile.in b/source/Makefile.in index e7494d7031d..926e4f75cfc 100644 --- a/source/Makefile.in +++ b/source/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/source/configure.in b/source/configure.in index 718baed3025..863496a0962 100644 --- a/source/configure.in +++ b/source/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) |