svn commit: samba r22859 - in branches: SAMBA_3_0_25/source SAMBA_3_0_26/source

[jra at samba.org]

Author: jra
Date: 2007-05-14 17:24:55 +0000 (Mon, 14 May 2007)
New Revision: 22859

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22859

Log:
Janitor for James Peach for rev. 22820
"Move FAM libraries from smbd to vfs_fam_notify. Should fix bugzilla #4426."
Please keep all branches in order.
Jeremy.

Modified:
   branches/SAMBA_3_0_25/source/Makefile.in
   branches/SAMBA_3_0_25/source/configure.in
   branches/SAMBA_3_0_26/source/Makefile.in
   branches/SAMBA_3_0_26/source/configure.in


Changeset:
Modified: branches/SAMBA_3_0_25/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0_25/source/Makefile.in	2007-05-14 17:08:18 UTC (rev 22858)
+++ branches/SAMBA_3_0_25/source/Makefile.in	2007-05-14 17:24:55 UTC (rev 22859)
@@ -1500,7 +1500,7 @@
 bin/notify_fam. at SHLIBEXT@: $(VFS_NOTIFY_FAM_OBJ)
 	@echo "Building plugin $@"
 	@$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_NOTIFY_FAM_OBJ) \
-		@SONAMEFLAG@`basename $@`
+		@SONAMEFLAG@`basename $@` @SMB_FAM_LIBS@
 
 bin/readahead. at SHLIBEXT@: $(VFS_READAHEAD_OBJ)
 	@echo "Building plugin $@"

Modified: branches/SAMBA_3_0_25/source/configure.in
===================================================================
--- branches/SAMBA_3_0_25/source/configure.in	2007-05-14 17:08:18 UTC (rev 22858)
+++ branches/SAMBA_3_0_25/source/configure.in	2007-05-14 17:24:55 UTC (rev 22859)
@@ -2538,13 +2538,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
@@ -2564,6 +2564,8 @@
     fi
 fi
 
+AC_SUBST(SMB_FAM_LIBS)
+
 #################################################
 # Check for DMAPI interfaces in libdm/libjfsdm/libxsdm
 
@@ -6204,7 +6206,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)

Modified: branches/SAMBA_3_0_26/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0_26/source/Makefile.in	2007-05-14 17:08:18 UTC (rev 22858)
+++ branches/SAMBA_3_0_26/source/Makefile.in	2007-05-14 17:24:55 UTC (rev 22859)
@@ -1501,7 +1501,7 @@
 bin/notify_fam. at SHLIBEXT@: $(VFS_NOTIFY_FAM_OBJ)
 	@echo "Building plugin $@"
 	@$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_NOTIFY_FAM_OBJ) \
-		@SONAMEFLAG@`basename $@`
+		@SONAMEFLAG@`basename $@` @SMB_FAM_LIBS@
 
 bin/readahead. at SHLIBEXT@: $(VFS_READAHEAD_OBJ)
 	@echo "Building plugin $@"

Modified: branches/SAMBA_3_0_26/source/configure.in
===================================================================
--- branches/SAMBA_3_0_26/source/configure.in	2007-05-14 17:08:18 UTC (rev 22858)
+++ branches/SAMBA_3_0_26/source/configure.in	2007-05-14 17:24:55 UTC (rev 22859)
@@ -2538,13 +2538,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
@@ -2564,6 +2564,8 @@
     fi
 fi
 
+AC_SUBST(SMB_FAM_LIBS)
+
 #################################################
 # Check for DMAPI interfaces in libdm/libjfsdm/libxsdm
 
@@ -6245,7 +6247,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)