[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha7-1694-g05870b7
Volker Lendecke
vlendec at samba.org
Tue May 19 18:46:15 GMT 2009
The branch, master has been updated
via 05870b7ee73d64cb30e56f14f37828a0c9b7e9ec (commit)
via 3e1b6487e76232756b854fb28a9d28717ae7d1d3 (commit)
from bb454b5fd95185a1456ea120b3a7c56f4a4f1c78 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 05870b7ee73d64cb30e56f14f37828a0c9b7e9ec
Author: Volker Lendecke <vl at samba.org>
Date: Tue May 19 20:45:45 2009 +0200
Another attempt at fixing the static build of vfs_notify_fam
commit 3e1b6487e76232756b854fb28a9d28717ae7d1d3
Author: Volker Lendecke <vl at samba.org>
Date: Tue May 19 20:45:22 2009 +0200
Fix detection of "enum FAMCodes"
-----------------------------------------------------------------------
Summary of changes:
source3/configure.in | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/configure.in b/source3/configure.in
index acbefe6..0393a75 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2452,7 +2452,7 @@ if test x$enable_fam != xno; then
if test x"$samba_cv_HAVE_LIBFAM" = x"yes" ; then
default_shared_modules="$default_shared_modules vfs_notify_fam"
AC_TRY_COMPILE([#include <fam.h>],
- [FAMCodes code = FAMChanged;],
+ [enum FAMCodes code = FAMChanged;],
AC_DEFINE(HAVE_FAM_H_FAMCODES_TYPEDEF, 1,
[Whether fam.h contains a typedef for enum FAMCodes]),
[])
@@ -6181,11 +6181,6 @@ MODULE_idmap_nss=STATIC
MODULE_nss_info_template=STATIC
-if test x"$MODULE_vfs_notify_fam" = xSTATIC ; then
- SMBD_FAM_LIBS="$SMB_FAM_LIBS"
- AC_SUBST(SMBD_FAM_LIBS)
-fi
-
AC_ARG_WITH(static-modules,
[AS_HELP_STRING([--with-static-modules=MODULES], [Comma-separated list of names of modules to statically link in])],
[ if test $withval; then
@@ -6204,6 +6199,12 @@ AC_ARG_WITH(shared-modules,
done
fi ])
+if test x"$MODULE_DEFAULT_vfs_notify_fam" = xSTATIC -o \
+ x"$MODULE_vfs_notify_fam" = xSTATIC ; then
+ SMBD_FAM_LIBS="$SMB_FAM_LIBS"
+ AC_SUBST(SMBD_FAM_LIBS)
+fi
+
SMB_MODULE(pdb_ldap, passdb/pdb_ldap.o passdb/pdb_nds.o, "bin/ldapsam.$SHLIBEXT", PDB,
[ PASSDB_LIBS="$PASSDB_LIBS $LDAP_LIBS" ] )
SMB_MODULE(pdb_smbpasswd, passdb/pdb_smbpasswd.o, "bin/smbpasswd.$SHLIBEXT", PDB)
--
Samba Shared Repository
More information about the samba-cvs
mailing list