diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-05-28 13:40:18 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-05-28 13:40:18 +1000 |
| commit | bb264d3a1f212be7eca4b38e61db19de8a26e158 (patch) | |
| tree | e44e69f4dcf8959fcfaffca13eff3c10ac2b055c /source4 | |
| parent | 275e057bea09c1d15228963a5b5650df28a4b24b (diff) | |
| parent | 8fb5ac6227e2b6123bb9fabc99fba36bd9aa0a92 (diff) | |
| download | samba-bb264d3a1f212be7eca4b38e61db19de8a26e158.tar.gz samba-bb264d3a1f212be7eca4b38e61db19de8a26e158.tar.bz2 samba-bb264d3a1f212be7eca4b38e61db19de8a26e158.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 7ae25aa6125e5375ac9c080a1e95fa34bda0dbe1)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/smb_build/input.pm | 1 | ||||
| -rw-r--r-- | source4/param/config.mk | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index a76da496d9..53a051a3c7 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/build/smb_build/input.pm @@ -84,7 +84,6 @@ sub check_module($$$) return if ($mod->{ENABLE} ne "YES"); - if (exists($INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTION_TYPE})) { $mod->{INIT_FUNCTION_TYPE} = $INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTION_TYPE}; } else { diff --git a/source4/param/config.mk b/source4/param/config.mk index c169ce157e..6af9dab5d9 100644 --- a/source4/param/config.mk +++ b/source4/param/config.mk @@ -13,7 +13,7 @@ PUBLIC_HEADERS += param/param.h PC_FILES += $(paramsrcdir)/samba-hostconfig.pc [SUBSYSTEM::PROVISION] -PRIVATE_DEPENDENCIES = LIBPYTHON +PRIVATE_DEPENDENCIES = LIBPYTHON swig_ldb PROVISION_OBJ_FILES = $(paramsrcdir)/provision.o |