From 83acc688e3cb21d3fe25129f1fa1522872e6eec2 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 30 Dec 2005 19:18:51 +0000
Subject: r12615: prepare building with ../samba4/source/configure
 --srcdir=../samba4/source/

metze
(This used to be commit bf35c74218476fc568e251bb337e794ed9d51fac)
---
 source4/build/smb_build/env.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'source4/build/smb_build/env.pm')

diff --git a/source4/build/smb_build/env.pm b/source4/build/smb_build/env.pm
index 1ad8e23d36..09d8eb1536 100644
--- a/source4/build/smb_build/env.pm
+++ b/source4/build/smb_build/env.pm
@@ -31,8 +31,13 @@ sub _set_config($$)
 
 	$self->{config} = $config;
 
-	$self->{config}->{srcdir} = '.';
-	$self->{config}->{builddir} = '.';
+	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};
-- 
cgit