summaryrefslogtreecommitdiff
path: root/source4/build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-21 23:59:34 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-21 23:59:34 +0200
commit49706ab19bd3ffd6125639e6a7753b2350cf54e1 (patch)
tree0b9493295e69ef8c85926a67b5413f83ee9cbee2 /source4/build
parentb1fc7bab111fcef7f546e821f24c175bdec6865a (diff)
downloadsamba-49706ab19bd3ffd6125639e6a7753b2350cf54e1.tar.gz
samba-49706ab19bd3ffd6125639e6a7753b2350cf54e1.tar.bz2
samba-49706ab19bd3ffd6125639e6a7753b2350cf54e1.zip
Move more modules inside of the samba package.
(This used to be commit 9b39e99f48266a54ed0b8890c2efde218b4b118a)
Diffstat (limited to 'source4/build')
-rw-r--r--source4/build/smb_build/config_mk.pm2
-rw-r--r--source4/build/smb_build/input.pm17
2 files changed, 5 insertions, 14 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index d28adb2e72..652a52fa60 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -20,7 +20,7 @@ my $section_types = {
"LDFLAGS" => "list",
},
"PYTHON" => {
- SWIG_FILE => "string",
+ "LIBRARY_REALNAME" => "string",
"PRIVATE_DEPENDENCIES" => "list",
"PUBLIC_DEPENDENCIES" => "list",
"ENABLE" => "bool",
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index c4c8f0de13..a76da496d9 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -138,21 +138,12 @@ sub check_python($$$)
$python->{INSTALLDIR} = "PYTHONDIR";
unless (defined($python->{CFLAGS})) { $python->{CFLAGS} = []; }
- if (defined($python->{SWIG_FILE})) {
- my $dirname = dirname($python->{SWIG_FILE});
- my $basename = basename($python->{SWIG_FILE}, ".i");
-
- $dirname .= "/" unless $dirname =~ /\/$/;
- $dirname = "" if $dirname eq "./";
-
- $python->{LIBRARY_REALNAME} = "_$basename.\$(SHLIBEXT)";
- $python->{INIT_FUNCTION} = "{ (char *)\"_$basename\", init_$basename }";
- } else {
- my $basename = $python->{NAME};
- $basename =~ s/^python_//g;
+ my $basename = $python->{NAME};
+ $basename =~ s/^python_//g;
+ unless (defined($python->{LIBRARY_REALNAME})) {
$python->{LIBRARY_REALNAME} = "$basename.\$(SHLIBEXT)";
- $python->{INIT_FUNCTION} = "{ (char *)\"$basename\", init$basename }";
}
+ $python->{INIT_FUNCTION} = "{ (char *)\"$basename\", init$basename }";
push (@{$python->{CFLAGS}}, "\$(EXT_LIB_PYTHON_CFLAGS)");
$python->{SUBSYSTEM} = "LIBPYTHON";