summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-05-16 18:20:02 +0200
committerVolker Lendecke <vl@samba.org>2009-05-16 19:22:03 +0200
commit31a2347a0af9a6f36c3f02d25327146659ee343f (patch)
treec9e8466b8448d791bb5ea18f8e5204e627ac3853 /source3
parent91aea36bbf0aad99cfe9062eb61cb3335a8342a1 (diff)
downloadsamba-31a2347a0af9a6f36c3f02d25327146659ee343f.tar.gz
samba-31a2347a0af9a6f36c3f02d25327146659ee343f.tar.bz2
samba-31a2347a0af9a6f36c3f02d25327146659ee343f.zip
Fix static linking of vfs_notify_fam
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in2
-rw-r--r--source3/configure.in5
2 files changed, 6 insertions, 1 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index f5e1f9eca5..31ef29ad15 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1425,7 +1425,7 @@ bin/.dummy:
bin/smbd@EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@ @BUILD_POPT@
@echo Linking $@
- @$(CC) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) \
+ @$(CC) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) @SMBD_FAM_LIBS@ \
$(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
$(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) $(AVAHI_LIBS) \
$(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
diff --git a/source3/configure.in b/source3/configure.in
index 8adf24e6ef..acbefe6d7b 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6181,6 +6181,11 @@ 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