svn commit: samba r2015 - branches/SAMBA_3_0/source trunk/source

[gd at samba.org]

Author: gd
Date: 2004-08-24 13:02:56 +0000 (Tue, 24 Aug 2004)
New Revision: 2015

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/&rev=2015&nolog=1

Log:
Reverting fix for #1474. 

Jelmer, we need to find another way to solve this bug. This way,
rpcclient is linked to libxml2, libmysqlclient and libpg (with according
dependencies in samba-client.rpm's) if one just wants to build the more
experimental pdb-modules as well.

Guenther

Modified:
   branches/SAMBA_3_0/source/Makefile.in
   trunk/source/Makefile.in


Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0/source/Makefile.in	2004-08-24 12:40:30 UTC (rev 2014)
+++ branches/SAMBA_3_0/source/Makefile.in	2004-08-24 13:02:56 UTC (rev 2015)
@@ -34,9 +34,6 @@
 IDMAP_LIBS=@IDMAP_LIBS@
 KRB5LIBS=@KRB5_LIBS@
 LDAP_LIBS=@LDAP_LIBS@
-XML_LIBS=@XML_LIBS@
-MYSQL_LIBS=@MYSQL_LIBS@
-PGSQL_LIBS=@PGSQL_LIBS@
 
 LINK=$(CC) $(FLAGS) $(LDFLAGS)
 
@@ -838,8 +835,7 @@
 	@echo Linking $@
 	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(PASSDB_LIBS) $(RPCCLIENT_OBJ) \
 		$(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ \
-		$(KRB5LIBS) $(LDAP_LIBS) \
-		$(XML_LIBS) $(MYSQL_LIBS) $(PGSQL_LIBS)
+		$(KRB5LIBS) $(LDAP_LIBS)
 
 bin/smbclient at EXEEXT@: $(CLIENT_OBJ) @BUILD_POPT@ bin/.dummy
 	@echo Linking $@
@@ -1119,12 +1115,12 @@
 
 bin/mysql. at SHLIBEXT@: $(MYSQL_OBJ:.o=. at PICSUFFIX@)
 	@echo "Building plugin $@"
-	@$(SHLD) $(LDSHFLAGS) -o $@ $(MYSQL_OBJ:.o=. at PICSUFFIX@) $(MYSQL_LIBS) \
+	@$(SHLD) $(LDSHFLAGS) -o $@ $(MYSQL_OBJ:.o=. at PICSUFFIX@) @MYSQL_LIBS@ \
 		@SONAMEFLAG@`basename $@`
 
 bin/pgsql. at SHLIBEXT@: $(PGSQL_OBJ:.o=. at PICSUFFIX@)
 	@echo "Building plugin $@"
-	@$(SHLD) $(LDSHFLAGS) -o $@ $(PGSQL_OBJ:.o=. at PICSUFFIX@) $(PGSQL_LIBS) \
+	@$(SHLD) $(LDSHFLAGS) -o $@ $(PGSQL_OBJ:.o=. at PICSUFFIX@) @PGSQL_LIBS@ \
       @SONAMEFLAG@`basename $@`
 
 bin/ldapsam. at SHLIBEXT@: passdb/pdb_ldap. at PICSUFFIX@
@@ -1164,7 +1160,7 @@
 
 bin/xml. at SHLIBEXT@: $(XML_OBJ:.o=. at PICSUFFIX@)
 	@echo "Building plugin $@"
-	@$(SHLD) $(LDSHFLAGS) -o $@ $(XML_OBJ:.o=. at PICSUFFIX@) $(XML_LIBS) \
+	@$(SHLD) $(LDSHFLAGS) -o $@ $(XML_OBJ:.o=. at PICSUFFIX@) @XML_LIBS@ \
 		@SONAMEFLAG@`basename $@`
 
 bin/audit. at SHLIBEXT@: $(VFS_AUDIT_OBJ:.o=. at PICSUFFIX@)

Modified: trunk/source/Makefile.in
===================================================================
--- trunk/source/Makefile.in	2004-08-24 12:40:30 UTC (rev 2014)
+++ trunk/source/Makefile.in	2004-08-24 13:02:56 UTC (rev 2015)
@@ -34,9 +34,6 @@
 IDMAP_LIBS=@IDMAP_LIBS@
 KRB5LIBS=@KRB5_LIBS@
 LDAP_LIBS=@LDAP_LIBS@
-XML_LIBS=@XML_LIBS@
-MYSQL_LIBS=@MYSQL_LIBS@
-PGSQL_LIBS=@PGSQL_LIBS@
 
 LINK=$(CC) $(FLAGS) $(LDFLAGS)
 
@@ -849,8 +846,7 @@
 	@echo Linking $@
 	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(PASSDB_LIBS) $(RPCCLIENT_OBJ) \
 		$(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ \
-		$(KRB5LIBS) $(LDAP_LIBS) \
-		$(XML_LIBS) $(MYSQL_LIBS) $(PGSQL_LIBS)
+		$(KRB5LIBS) $(LDAP_LIBS)
 
 bin/smbclient at EXEEXT@: $(CLIENT_OBJ) @BUILD_POPT@ bin/.dummy
 	@echo Linking $@
@@ -1135,12 +1131,12 @@
 
 bin/mysql. at SHLIBEXT@: $(MYSQL_OBJ:.o=. at PICSUFFIX@)
 	@echo "Building plugin $@"
-	@$(SHLD) $(LDSHFLAGS) -o $@ $(MYSQL_OBJ:.o=. at PICSUFFIX@) $(MYSQL_LIBS) \
+	@$(SHLD) $(LDSHFLAGS) -o $@ $(MYSQL_OBJ:.o=. at PICSUFFIX@) @MYSQL_LIBS@ \
 		@SONAMEFLAG@`basename $@`
 
 bin/pgsql. at SHLIBEXT@: $(PGSQL_OBJ:.o=. at PICSUFFIX@)
 	@echo "Building plugin $@"
-	@$(SHLD) $(LDSHFLAGS) -o $@ $(PGSQL_OBJ:.o=. at PICSUFFIX@) $(PGSQL_LIBS) \
+	@$(SHLD) $(LDSHFLAGS) -o $@ $(PGSQL_OBJ:.o=. at PICSUFFIX@) @PGSQL_LIBS@ \
       @SONAMEFLAG@`basename $@`
 
 bin/ldapsam. at SHLIBEXT@: passdb/pdb_ldap. at PICSUFFIX@
@@ -1180,7 +1176,7 @@
 
 bin/xml. at SHLIBEXT@: $(XML_OBJ:.o=. at PICSUFFIX@)
 	@echo "Building plugin $@"
-	@$(SHLD) $(LDSHFLAGS) -o $@ $(XML_OBJ:.o=. at PICSUFFIX@) $(XML_LIBS) \
+	@$(SHLD) $(LDSHFLAGS) -o $@ $(XML_OBJ:.o=. at PICSUFFIX@) @XML_LIBS@ \
 		@SONAMEFLAG@`basename $@`
 
 bin/audit. at SHLIBEXT@: $(VFS_AUDIT_OBJ:.o=. at PICSUFFIX@)