From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 30 Nov 2011 20:16:50 +0000 (+0000)
Subject: [packages] samba3: depend on cups if printing support is not disabled, fix build... 
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=8ee6e727e913a32006ecf3d31e4717c572e6f039

[packages] samba3: depend on cups if printing support is not disabled, fix build with SAMBA3_CONFIG_SMALLER=y and SAMBA3_CONFIG_NO_PRINTING=n


SVN-Revision: 29371
---

diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 877186ac43..613971a8b0 100644
--- 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 680bec1e2d..c9260d1836 100644
--- 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)