svn commit: samba r22302 - in branches/SAMBA_3_0/source: .

[metze at samba.org]

Author: metze
Date: 2007-04-17 10:07:12 +0000 (Tue, 17 Apr 2007)
New Revision: 22302

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

Log:
fix the build when no shared-library support is detected

metze
Modified:
   branches/SAMBA_3_0/source/Makefile.in
   branches/SAMBA_3_0/source/configure.in


Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0/source/Makefile.in	2007-04-17 10:05:43 UTC (rev 22301)
+++ branches/SAMBA_3_0/source/Makefile.in	2007-04-17 10:07:12 UTC (rev 22302)
@@ -176,7 +176,7 @@
 
 PAM_MODULES = @PAM_MODULES@
 
-NSS_MODULES = @WINBIND_WINS_NSS@ @WINBIND_NSS@
+NSS_MODULES = @NSS_MODULES@
 
 SCRIPTS = $(srcdir)/script/smbtar $(builddir)/script/findsmb
 

Modified: branches/SAMBA_3_0/source/configure.in
===================================================================
--- branches/SAMBA_3_0/source/configure.in	2007-04-17 10:05:43 UTC (rev 22301)
+++ branches/SAMBA_3_0/source/configure.in	2007-04-17 10:07:12 UTC (rev 22302)
@@ -297,6 +297,7 @@
 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_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