diff options
| author | Sven Neumann <s.neumann@raumfeld.com> | 2009-09-21 18:21:53 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-09-21 23:28:23 +0200 |
| commit | e7da301b4279c10b787c3b4b64e2ffc4abb13e50 (patch) | |
| tree | cd75853beaa926fd1c8c5b91da7e3215fba21db0 | |
| parent | 1d9178db29be6eeeccf437949013d50d5241e4f1 (diff) | |
samba: fix dependencies
The samba configure scripts detects the presence of fam and avahi
headers in order to decide whether support for fam and/or avahi should
be built into samba. This patch adds the missing dependencies so that
fam and/or avahi are built before samba if they are selected in buildroot.
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | package/samba/samba.mk | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/package/samba/samba.mk b/package/samba/samba.mk index c4ecebf2d..1cead4083 100644 --- a/package/samba/samba.mk +++ b/package/samba/samba.mk @@ -11,6 +11,8 @@ SAMBA_CAT:=$(ZCAT) SAMBA_BINARY:=bin/smbd SAMBA_TARGET_BINARY:=usr/sbin/smbd +SAMBA_DEPENDENCIES=libiconv + ifeq ($(BR2_PACKAGE_SAMBA_LIBSMBCLIENT),y) SAMBA_LIBSMBCLIENT := libsmbclient SAMBA_CONF_OPTIONS := --enable-libsmbclient @@ -19,6 +21,21 @@ SAMBA_LIBSMBCLIENT := SAMBA_CONF_OPTIONS := --disable-libsmbclient endif +ifeq ($(BR2_PACKAGE_AVAHI),y) +SAMBA_CONF_OPTIONS := --enable-avahi +SAMBA_DEPENDENCIES += avahi +else +SAMBA_CONF_OPTIONS := --disable-avahi +endif + +ifeq ($(BR2_PACKAGE_GAMIN),y) +SAMBA_CONF_OPTIONS := --enable-fam +SAMBA_DEPENDENCIES += gamin +else +SAMBA_CONF_OPTIONS := --disable-fam +endif + + $(DL_DIR)/$(SAMBA_SOURCE): $(call DOWNLOAD,$(SAMBA_SITE),$(SAMBA_SOURCE)) @@ -147,7 +164,7 @@ libsmbclient: $(SAMBA_DIR)/bin/libsmbclient.so DESTDIR="$(STAGING_DIR)" \ -C $(SAMBA_DIR) installlibs -samba: libiconv $(TARGET_DIR)/$(SAMBA_TARGET_BINARY) $(SAMBA_LIBSMBCLIENT) +samba: $(SAMBA_DEPENDENCIES) $(TARGET_DIR)/$(SAMBA_TARGET_BINARY) $(SAMBA_LIBSMBCLIENT) samba-source: $(DL_DIR)/$(SAMBA_SOURCE) |