bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] samba3: reverse logic of printing support, fix recursive dep between nmbd and samba3, fix recursive dep between samba, cups and printer support

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@29374 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2011-12-01 17:39:25 +00:00
parent e0e6ce7dd7
commit 2fc9ca7640
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
net/samba3/Config.in
View File

@ -6,6 +6,15 @@ config SAMBA3_CONFIG_DEBUG
Enables debugging support (will make binaries *much* bigger)
Also increases MAX_DEBUG_LEVEL to get more messages (also increases binary sizes!)
config SAMBA3_CONFIG_PRINTING
bool "Enable shared printing support"
depends PACKAGE_samba3
select PACKAGE_cups
default n
help
Enable shared printing support.
Adds about 18kB for smbd, about 15kB for nmbd and about 18kB for smbpasswd
config SAMBA3_CONFIG_SMALLER
bool "Make samba3 even smaller"
depends PACKAGE_samba3
@ -13,11 +22,3 @@ config SAMBA3_CONFIG_SMALLER
help
Removes support for ???
Saves about 18kB for smbd, about 16kB for nmbd and about 17kB for smbpasswd
config SAMBA3_CONFIG_NO_PRINTING
bool "Remove shared printing support"
depends PACKAGE_samba3
default y
help
Removes shared printing support.
Saves about 18kB for smbd, about 15kB for nmbd and about 18kB for smbpasswd

10
net/samba3/Makefile
View File

@ -30,13 +30,13 @@ endef
define Package/samba3
$(call Package/samba3/Default)
TITLE:=SMB server for file and printer sharing
DEPENDS:=+libpthread +libpopt $(ICONV_DEPENDS) +!SAMBA3_CONFIG_NO_PRINTING:cups
DEPENDS:=+libpthread +libpopt $(ICONV_DEPENDS)
endef
define Package/samba3-nmbd
$(call Package/samba3/Default)
TITLE:=NetBIOS name server
DEPENDS:=+samba3
DEPENDS:=samba3
endef
define Package/samba3-mountcifs
@ -74,11 +74,11 @@ endef
TARGET_CFLAGS+=$(if $(CONFIG_SAMBA3_CONFIG_DEBUG),-DSAMBA_DEBUG,-DMAX_DEBUG_LEVEL=2)
TARGET_CFLAGS+=$(if $(CONFIG_SAMBA3_CONFIG_SMALLER),-DAVM_SMALLER)
TARGET_CFLAGS+=$(if $(CONFIG_SAMBA3_CONFIG_NO_PRINTING),-DAVM_NO_PRINTING)
TARGET_CFLAGS+=$(if $(CONFIG_SAMBA3_CONFIG_PRINTING),,-DAVM_NO_PRINTING)
CONFIGURE_PATH:=source
CONFIGURE_ARGS+= \
$(if $(CONFIG_SAMBA3_CONFIG_DEBUG),--enable-debug) \
$(if $(CONFIG_SAMBA3_CONFIG_NO_PRINTING),--enable-cups=no --enable-iprint=no) \
$(if $(CONFIG_SAMBA3_CONFIG_PRINTING),,--enable-cups=no --enable-iprint=no) \
--without-krb5 \
--without-ads \
--without-ldap \
@ -99,7 +99,7 @@ CONFIGURE_VARS+= \
MAKE_PATH=source
MAKE_FLAGS += \
$(if $(CONFIG_SAMBA3_CONFIG_NO_PRINTING),OWRT_NO_PRINTING=1) \
$(if $(CONFIG_SAMBA3_CONFIG_PRINTING),,OWRT_NO_PRINTING=1) \
$(if $(CONFIG_SAMBA3_CONFIG_SMALLER),OWRT_SMALLER=1)
define Build/Compile