The branch, v4-0-test has been updated
via 28bbd546195461d4b8747bc6cefd6320f8efe17d (commit)
via e33f357fb00cd504181562eaf2ca1d4511d5ec51 (commit)
via 10f0b5f83f0b34ae9d0f83c0975cf06bf56277d4 (commit)
from cf59ec4cc3c3dca9275236bf45caf56632bf983a (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 28bbd546195461d4b8747bc6cefd6320f8efe17d
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date: Mon Feb 25 19:11:04 2008 +0100
Merge env.pm into makefile.pm.
commit e33f357fb00cd504181562eaf2ca1d4511d5ec51
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date: Mon Feb 25 18:51:39 2008 +0100
Move configure output details out of perl code.
commit 10f0b5f83f0b34ae9d0f83c0975cf06bf56277d4
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date: Fri Feb 29 13:58:20 2008 +0100
Avoid use of removed variable.
-----------------------------------------------------------------------
Summary of changes:
source/build/smb_build/env.pm | 57 ------------------------------------
source/build/smb_build/main.pl | 8 -----
source/build/smb_build/makefile.pm | 37 ++++++++++++++++++-----
source/configure.ac | 9 ++++++
4 files changed, 38 insertions(+), 73 deletions(-)
delete mode 100644 source/build/smb_build/env.pm
Changeset truncated at 500 lines:
diff --git a/source/build/smb_build/env.pm b/source/build/smb_build/env.pm
deleted file mode 100644
index 76cd8d1..0000000
--- a/source/build/smb_build/env.pm
+++ /dev/null
@@ -1,57 +0,0 @@
-# Environment class
-#
-# Samba Build Environment
-#
-# (C) 2005 Jelmer Vernooij <[EMAIL PROTECTED]>
-#
-# Published under the GNU GPL
-
-package smb_build::env;
-use smb_build::input;
-use File::Path;
-use File::Basename;
-
-use strict;
-
-sub new($$)
-{
- my ($name, $config) = @_;
- my $self = { };
- bless $self, $name;
-
- $self->{items} = {};
- $self->{info} = {};
-
- $self->_set_config($config);
-
- return $self;
-}
-
-sub _set_config($$)
-{
- my ($self, $config) = @_;
-
- $self->{config} = $config;
-
- if (not defined($self->{config}->{srcdir})) {
- $self->{config}->{srcdir} = '.';
- }
-
- if (not defined($self->{config}->{builddir})) {
- $self->{config}->{builddir} = '.';
- }
-
- if ($self->{config}->{prefix} eq "NONE") {
- $self->{config}->{prefix} =
$self->{config}->{ac_default_prefix};
- }
-
- if ($self->{config}->{exec_prefix} eq "NONE") {
- $self->{config}->{exec_prefix} = $self->{config}->{prefix};
- }
-
- $self->{developer} = ($self->{config}->{developer} eq "yes");
- $self->{gnu_make} = ($self->{config}->{GNU_MAKE} eq "yes");
- $self->{automatic_deps} = ($self->{config}->{automatic_dependencies} eq
"yes");
-}
-
-1;
diff --git a/source/build/smb_build/main.pl b/source/build/smb_build/main.pl
index 9690c46..6d4a732 100644
--- a/source/build/smb_build/main.pl
+++ b/source/build/smb_build/main.pl
@@ -10,7 +10,6 @@ use smb_build::header;
use smb_build::input;
use smb_build::config_mk;
use smb_build::output;
-use smb_build::env;
use smb_build::cflags;
use smb_build::summary;
use smb_build::config;
@@ -93,11 +92,4 @@ cflags::create_cflags($OUTPUT, $config::config{srcdir},
summary::show($OUTPUT, \%config::config);
-if ($shared_libs_used) {
- print <<EOF;
-To run binaries without installing, set the following environment variable:
- $config::config{LIB_PATH_VAR}=$config::config{builddir}/bin/shared
-EOF
-}
-
1;
diff --git a/source/build/smb_build/makefile.pm
b/source/build/smb_build/makefile.pm
index 96ab789..8e6df89 100644
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -6,21 +6,21 @@
# Released under the GNU GPL
package smb_build::makefile;
-use smb_build::env;
use smb_build::output;
use File::Basename;
use strict;
-use base 'smb_build::env';
use Cwd 'abs_path';
sub new($$$)
{
my ($myname, $config, $mkfile) = @_;
- my $self = new smb_build::env($config);
-
+ my $self = {};
+
bless($self, $myname);
+ $self->_set_config($config);
+
$self->{output} = "";
$self->{mkfile} = $mkfile;
@@ -38,6 +38,29 @@ sub new($$$)
return $self;
}
+sub _set_config($$)
+{
+ my ($self, $config) = @_;
+
+ $self->{config} = $config;
+
+ if (not defined($self->{config}->{srcdir})) {
+ $self->{config}->{srcdir} = '.';
+ }
+
+ if (not defined($self->{config}->{builddir})) {
+ $self->{config}->{builddir} = '.';
+ }
+
+ if ($self->{config}->{prefix} eq "NONE") {
+ $self->{config}->{prefix} =
$self->{config}->{ac_default_prefix};
+ }
+
+ if ($self->{config}->{exec_prefix} eq "NONE") {
+ $self->{config}->{exec_prefix} = $self->{config}->{prefix};
+ }
+}
+
sub output($$)
{
my ($self, $text) = @_;
@@ -291,13 +314,11 @@ sub Binary($$)
{
my ($self,$ctx) = @_;
- my $extradir = "";
-
unless (defined($ctx->{INSTALLDIR})) {
} elsif ($ctx->{INSTALLDIR} eq "SBINDIR") {
- $self->output("SBIN_PROGS += $installdir/$ctx->{BINARY}\n");
+ $self->output("SBIN_PROGS += bin/$ctx->{BINARY}\n");
} elsif ($ctx->{INSTALLDIR} eq "BINDIR") {
- $self->output("BIN_PROGS += $installdir/$ctx->{BINARY}\n");
+ $self->output("BIN_PROGS += bin/$ctx->{BINARY}\n");
}
$self->output("binaries:: $ctx->{TARGET_BINARY}\n");
diff --git a/source/configure.ac b/source/configure.ac
index b609b4f..66556ad 100644
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -226,3 +226,12 @@ AC_FOREACH([AC_Var], m4_defn([_AC_SUBST_VARS]), [
AC_Var = $AC_Var])
$MAKE_SETTINGS
CEOF
+
+if test $USESHARED = true
+then
+ echo "To run binaries without installing, set the following environment
variable:"
+ echo "$ac_cv_LIB_PATH_VAR=$builddir/bin/shared"
+fi
+
+echo
+echo "To build Samba, run $ac_cv_path_MAKE"
--
Samba Shared Repository
