r22820: Move FAM libraries from smbd to vfs_fam_notify. Should fix bugzilla #4426.

diff --git a/source/Makefile.in b/source/Makefile.in
index e7494d7031d656b9b5934bd704636f1c50064cd8..926e4f75cfc87ea258a672828d7cecb6fb5b4210 100644 (file)
--- 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 718baed3025625558984714d6e13e3bfab37c5e3..863496a0962b1a119f6370a19c5ae47747c1aae9 100644 (file)
--- 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)