summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-03-17 15:36:03 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:57:35 -0500
commit48e22c1547ff7b2fefa81ac60b8854e74ff86ffc (patch)
tree552b93e7cc6fe3b3e4a01b8e40d50ff749dac304
parent5b0051e0325aea7e46715aa61bba0a1dc025132c (diff)
downloadsamba-48e22c1547ff7b2fefa81ac60b8854e74ff86ffc.tar.gz
samba-48e22c1547ff7b2fefa81ac60b8854e74ff86ffc.tar.bz2
samba-48e22c1547ff7b2fefa81ac60b8854e74ff86ffc.zip
r14516: dynconfig fixes
(This used to be commit c7f6b0801da00d6eeb846f63a39b656f02b7a6e8)
-rw-r--r--source4/build/smb_build/makefile.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index e822329a2e..e632895f20 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -452,7 +452,8 @@ sub PkgConfig($$)
"-l$link_name",
"",
"$ctx->{VERSION}",
- $ctx->{DESCRIPTION}
+ $ctx->{DESCRIPTION},
+ 1
);
}
@@ -511,6 +512,7 @@ sub write($$)
# nasty hack to allow running locally
if ($self->{duplicate_build}) {
+ $self->output("bin/libdynconfig.\$(SHLIBEXT): dynconfig-devel.o\n");
$self->output("bin/libdynconfig.\$(SHLIBEXT): LIBRARY_DYNCONFIG_OBJ_LIST=dynconfig-devel.o\n");
}