r22302: fix the build when no shared-library support is detected
authorStefan Metzmacher <metze@samba.org>
Tue, 17 Apr 2007 10:07:12 +0000 (10:07 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 17:19:25 +0000 (12:19 -0500)
metze

source/Makefile.in
source/configure.in

index ac2f8f2551c2627ff3c0059eccc385e6eabd6bc2..526f637cb8cccb111197724a01064bb42e86478b 100644 (file)
@@ -176,7 +176,7 @@ SHLIBS = @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBMSRPC@ @LIBADDNS@
 
 PAM_MODULES = @PAM_MODULES@
 
-NSS_MODULES = @WINBIND_WINS_NSS@ @WINBIND_NSS@
+NSS_MODULES = @NSS_MODULES@
 
 SCRIPTS = $(srcdir)/script/smbtar $(builddir)/script/findsmb
 
index 6cf72a4477f3930b0afe0c7e6654ff9176f4009e..77704ac85a2d121e7c6a035cffeefda61942de13 100644 (file)
@@ -297,6 +297,7 @@ AC_SUBST(LDAP_LIBS)
 AC_SUBST(PAM_MODULES)
 AC_SUBST(INSTALL_PAM_MODULES)
 AC_SUBST(UNINSTALL_PAM_MODULES)
+AC_SUBST(NSS_MODULES)
 AC_SUBST(EXTRA_BIN_PROGS)
 AC_SUBST(SMBMOUNT_PROGS)
 AC_SUBST(CIFSMOUNT_PROGS)
@@ -5784,6 +5785,10 @@ AC_SUBST(WINBIND_NSS_EXTRA_OBJS)
 AC_SUBST(WINBIND_NSS_EXTRA_LIBS)
 AC_SUBST(NSSSONAMEVERSIONSUFFIX)
 
+if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes"; then
+       NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}"
+fi
+
 AC_SUBST(SMB_KRB5_LOCATOR)
 
 # Check the setting of --with-winbind