summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2004-08-24 13:02:56 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:52:28 -0500
commitba183f876ecb3bfcf534752e8ab5f8c1373ddac7 (patch)
tree289f2db5c4b8e55fdafb6ddde2ff54408074a60e /source3
parentd6a1f3f24ba09fc09024d243d5bb14ce9507c463 (diff)
downloadsamba-ba183f876ecb3bfcf534752e8ab5f8c1373ddac7.tar.gz
samba-ba183f876ecb3bfcf534752e8ab5f8c1373ddac7.tar.bz2
samba-ba183f876ecb3bfcf534752e8ab5f8c1373ddac7.zip
r2015: 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 (This used to be commit 67bffc5034121cc0069007a7b79ce189ab0d10be)
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in12
1 files changed, 4 insertions, 8 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 567b7f4df6..7ce45deb39 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -34,9 +34,6 @@ PASSDB_LIBS=@PASSDB_LIBS@
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 @@ bin/rpcclient@EXEEXT@: $(RPCCLIENT_OBJ) @BUILD_POPT@ bin/.dummy
@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@EXEEXT@: $(CLIENT_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@@ -1119,12 +1115,12 @@ bin/sam.@SHLIBEXT@: $(AUTH_SAM_OBJ:.o=.@PICSUFFIX@)
bin/mysql.@SHLIBEXT@: $(MYSQL_OBJ:.o=.@PICSUFFIX@)
@echo "Building plugin $@"
- @$(SHLD) $(LDSHFLAGS) -o $@ $(MYSQL_OBJ:.o=.@PICSUFFIX@) $(MYSQL_LIBS) \
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(MYSQL_OBJ:.o=.@PICSUFFIX@) @MYSQL_LIBS@ \
@SONAMEFLAG@`basename $@`
bin/pgsql.@SHLIBEXT@: $(PGSQL_OBJ:.o=.@PICSUFFIX@)
@echo "Building plugin $@"
- @$(SHLD) $(LDSHFLAGS) -o $@ $(PGSQL_OBJ:.o=.@PICSUFFIX@) $(PGSQL_LIBS) \
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(PGSQL_OBJ:.o=.@PICSUFFIX@) @PGSQL_LIBS@ \
@SONAMEFLAG@`basename $@`
bin/ldapsam.@SHLIBEXT@: passdb/pdb_ldap.@PICSUFFIX@
@@ -1164,7 +1160,7 @@ bin/macosxfs.@SHLIBEXT@: $(CHARSET_MACOSXFS_OBJ:.o=.@PICSUFFIX@)
bin/xml.@SHLIBEXT@: $(XML_OBJ:.o=.@PICSUFFIX@)
@echo "Building plugin $@"
- @$(SHLD) $(LDSHFLAGS) -o $@ $(XML_OBJ:.o=.@PICSUFFIX@) $(XML_LIBS) \
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(XML_OBJ:.o=.@PICSUFFIX@) @XML_LIBS@ \
@SONAMEFLAG@`basename $@`
bin/audit.@SHLIBEXT@: $(VFS_AUDIT_OBJ:.o=.@PICSUFFIX@)