[packages] samba3: depend on cups if printing support is not disabled, fix build...

git-svn-id: svn://svn.openwrt.org/openwrt/packages@29371 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 877186a..613971a 100644 (file)
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -30,7 +30,7 @@ endef
 define Package/samba3
 $(call Package/samba3/Default)
   TITLE:=SMB server for file and printer sharing
-  DEPENDS:=+libpthread +libpopt $(ICONV_DEPENDS)
+  DEPENDS:=+libpthread +libpopt $(ICONV_DEPENDS) +!CONFIG_SAMBA3_CONFIG_NO_PRINTING:cups
 endef
 
 define Package/samba3-nmbd

diff --git a/net/samba3/patches/510-remove-printing.patch b/net/samba3/patches/510-remove-printing.patch
index 680bec1..c9260d1 100644 (file)
--- a/net/samba3/patches/510-remove-printing.patch
+++ b/net/samba3/patches/510-remove-printing.patch
@@ -14,7 +14,7 @@
  RPC_DFS_OBJ =  $(if $(OWRT_SMALLER),,rpc_server/srv_dfs.o rpc_server/srv_dfs_nt.o)
  
 -RPC_SPOOLSS_OBJ = $(if $(OWRT_SMALLER),,rpc_server/srv_spoolss.o rpc_server/srv_spoolss_nt.o)
-+RPC_SPOOLSS_OBJ = $(if $(OWRT_SMALLER)$(OWRT_NO_PRINTING),,rpc_server/srv_spoolss.o rpc_server/srv_spoolss_nt.o)
++RPC_SPOOLSS_OBJ = $(if $(OWRT_NO_PRINTING),,rpc_server/srv_spoolss.o rpc_server/srv_spoolss_nt.o)
  
  RPC_EVENTLOG_OBJ = $(if $(OWRT_SMALLER),,rpc_server/srv_eventlog.o rpc_server/srv_eventlog_nt.o rpc_server/srv_eventlog_lib.o)