svn commit: samba r22102 - in branches: SAMBA_3_0/source SAMBA_3_0_25/source

[lmuelle at samba.org]

Author: lmuelle
Date: 2007-04-06 16:27:28 +0000 (Fri, 06 Apr 2007)
New Revision: 22102

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

Log:
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.

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


Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0/source/Makefile.in	2007-04-06 16:23:55 UTC (rev 22101)
+++ branches/SAMBA_3_0/source/Makefile.in	2007-04-06 16:27:28 UTC (rev 22102)
@@ -172,7 +172,7 @@
 	bin/talloctort at EXEEXT@ bin/replacetort at EXEEXT@ \
 	bin/log2pcap at EXEEXT@ bin/sharesec at EXEEXT@ bin/ndrdump at EXEEXT@
 
-SHLIBS = @SHLIB_PROGS@ @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBMSRPC@ @LIBADDNS@
+SHLIBS = @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBMSRPC@ @LIBADDNS@
 
 PAM_MODULES = @PAM_MODULES@
 
@@ -888,7 +888,7 @@
 # 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)
 

Modified: branches/SAMBA_3_0/source/configure.in
===================================================================
--- branches/SAMBA_3_0/source/configure.in	2007-04-06 16:23:55 UTC (rev 22101)
+++ branches/SAMBA_3_0/source/configure.in	2007-04-06 16:27:28 UTC (rev 22102)
@@ -294,7 +294,6 @@
 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 @@
 
 	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)

Modified: branches/SAMBA_3_0_25/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0_25/source/Makefile.in	2007-04-06 16:23:55 UTC (rev 22101)
+++ branches/SAMBA_3_0_25/source/Makefile.in	2007-04-06 16:27:28 UTC (rev 22102)
@@ -168,7 +168,7 @@
 	bin/talloctort at EXEEXT@ bin/replacetort at EXEEXT@ \
 	bin/log2pcap at EXEEXT@ bin/sharesec at EXEEXT@
 
-SHLIBS = @SHLIB_PROGS@ @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBMSRPC@ @LIBADDNS@
+SHLIBS = @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBMSRPC@ @LIBADDNS@
 
 PAM_MODULES = @PAM_MODULES@
 
@@ -825,7 +825,7 @@
 # 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)
 

Modified: branches/SAMBA_3_0_25/source/configure.in
===================================================================
--- branches/SAMBA_3_0_25/source/configure.in	2007-04-06 16:23:55 UTC (rev 22101)
+++ branches/SAMBA_3_0_25/source/configure.in	2007-04-06 16:27:28 UTC (rev 22102)
@@ -294,7 +294,6 @@
 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)
@@ -5763,14 +5762,10 @@
 
 	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)