From a6209ac56a7dacfce81281070d6672166ccb133f Mon Sep 17 00:00:00 2001
From: Lars Müller <lmuelle@samba.org>
Date: Fri, 6 Apr 2007 16:27:28 +0000
Subject: r22102: Remove obsoleted SHLIBS_PROGS from {Makefile,configure}.in.

As NSS_MODULES is added to the all rule the resulting set of binaries
are the same.
(This used to be commit 3bebb5f4c1c09493e81a96efdc09742abd9adacf)
---
 source3/Makefile.in  |  4 ++--
 source3/configure.in | 13 ++++---------
 2 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'source3')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index fbd42c1065..ca29f5733d 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -172,7 +172,7 @@ EVERYTHING_PROGS = bin/debug2html@EXEEXT@ bin/smbfilter@EXEEXT@ \
 	bin/talloctort@EXEEXT@ bin/replacetort@EXEEXT@ \
 	bin/log2pcap@EXEEXT@ bin/sharesec@EXEEXT@ bin/ndrdump@EXEEXT@
 
-SHLIBS = @SHLIB_PROGS@ @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBMSRPC@ @LIBADDNS@
+SHLIBS = @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBMSRPC@ @LIBADDNS@
 
 PAM_MODULES = @PAM_MODULES@
 
@@ -888,7 +888,7 @@ NTLM_AUTH_OBJ = ${NTLM_AUTH_OBJ1} $(LIBSAMBA_OBJ) $(POPT_LIB_OBJ) \
 # now the rules...
 ######################################################################
 all : SHOWFLAGS $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \
-	$(SHLIBS) $(MODULES) $(PAM_MODULES) @EXTRA_ALL_TARGETS@
+	$(SHLIBS) $(MODULES) $(NSS_MODULES) $(PAM_MODULES) @EXTRA_ALL_TARGETS@
 
 nss_modules : $(NSS_MODULES)
 
diff --git a/source3/configure.in b/source3/configure.in
index 7eb1b78a01..ea6ba6b4f7 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -294,7 +294,6 @@ AC_SUBST(IDMAP_LIBS)
 AC_SUBST(KRB5_LIBS)
 AC_SUBST(UUID_LIBS)
 AC_SUBST(LDAP_LIBS)
-AC_SUBST(SHLIB_PROGS)
 AC_SUBST(PAM_MODULES)
 AC_SUBST(INSTALL_PAM_MODULES)
 AC_SUBST(UNINSTALL_PAM_MODULES)
@@ -5798,14 +5797,10 @@ if test x"$HAVE_WINBIND" = x"yes"; then
 
 	EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
 	EXTRA_SBIN_PROGS="$EXTRA_SBIN_PROGS bin/winbindd\$(EXEEXT)"
-        if test $BLDSHARED = true; then
-		SHLIB_PROGS="$SHLIB_PROGS $WINBIND_NSS $WINBIND_WINS_NSS"
-
-		if test x"$create_pam_modules" = x"yes"; then
-			PAM_MODULES="$PAM_MODULES pam_winbind"
-			INSTALL_PAM_MODULES="installpammodules"
-			UNINSTALL_PAM_MODULES="uninstallpammodules"
-		fi
+        if test $BLDSHARED = true -a x"$create_pam_modules" = x"yes"; then
+		PAM_MODULES="$PAM_MODULES pam_winbind"
+		INSTALL_PAM_MODULES="installpammodules"
+		UNINSTALL_PAM_MODULES="uninstallpammodules"
 	fi
 else
         AC_MSG_RESULT(no$winbind_no_reason)
-- 
cgit