diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-25 20:40:37 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-25 20:40:37 +0100 |
| commit | b5bd6636907c76f6bb562b62abca78a7aeed83d8 (patch) | |
| tree | 56f181f238716ba2b530cf3a723f6a28497bf7c6 /source4/build/smb_build/main.pl | |
| parent | a17f0ab3e0228edcd02b5f180252a54492feb6b8 (diff) | |
| download | samba-b5bd6636907c76f6bb562b62abca78a7aeed83d8.tar.gz samba-b5bd6636907c76f6bb562b62abca78a7aeed83d8.tar.bz2 samba-b5bd6636907c76f6bb562b62abca78a7aeed83d8.zip | |
Fix use of realpath, fix init functions for ldb.
(This used to be commit ca510136d2c4cae8f520c76df6aaadb5d412bea1)
Diffstat (limited to 'source4/build/smb_build/main.pl')
| -rw-r--r-- | source4/build/smb_build/main.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 47e48c3da7..b23976956c 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -67,8 +67,8 @@ foreach my $key (values %$OUTPUT) { $mkenv->PythonFiles($key) if defined($key->{PYTHON_FILES}); $mkenv->Manpage($key) if defined($key->{MANPAGE}); $mkenv->Header($key) if defined($key->{PUBLIC_HEADERS}); - if ($key->{TYPE} eq "MODULE" and defined($key->{INIT_FUNCTION})) { - $mkenv->output("$key->{SUBSYSTEM}_INIT_FUNCTIONS += \"$key->{INIT_FUNCTION},\"\n"); + if ($key->{TYPE} eq "MODULE" and $key->{OUTPUT_TYPE} eq "MERGED_OBJ" and defined($key->{INIT_FUNCTION})) { + $mkenv->output("$key->{SUBSYSTEM}_INIT_FUNCTIONS += $key->{INIT_FUNCTION},\n"); } $mkenv->CFlags($key); } |