summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-06-20 23:11:48 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:18:36 -0500
commit331aaa52562f0676224f1b00f7e306210797c790 (patch)
treea08aea9d0d81a2512f96abd174bc241fa903792d
parentb7be627e35b81fb2df8cdd83d129713aa8f0127a (diff)
downloadsamba-331aaa52562f0676224f1b00f7e306210797c790.tar.gz
samba-331aaa52562f0676224f1b00f7e306210797c790.tar.bz2
samba-331aaa52562f0676224f1b00f7e306210797c790.zip
r7790: Allow remembering more configure-level data (and
remember --enable-develop for now). (This used to be commit f385753a5224282dd2c228115622a6eb80624a5a)
-rw-r--r--source4/build/m4/check_path.m42
-rw-r--r--source4/build/m4/core.m43
-rw-r--r--source4/build/smb_build/main.pm5
-rw-r--r--source4/build/smb_build/makefile.pm8
4 files changed, 12 insertions, 6 deletions
diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4
index 314a368cf2..5fec1c3f05 100644
--- a/source4/build/m4/check_path.m4
+++ b/source4/build/m4/check_path.m4
@@ -137,6 +137,8 @@ AC_ARG_ENABLE(developer, [ --enable-developer Turn on developer warnings a
CFLAGS="${CFLAGS} -g -Wall"
developer=yes
DEVELOPER_CFLAGS="-Wshadow -Werror-implicit-function-declaration -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wdeclaration-after-statement -Wmissing-format-attribute -Wformat=2 -Wno-format-y2k -DDEBUG_PASSWORD -DDEVELOPER"
+ SMB_INFO_BUILD_ENV="$SMB_INFO_BUILD_ENV
+ \$SETTINGS{DEVELOPER} = \"YES\";"
fi])
debug=no
diff --git a/source4/build/m4/core.m4 b/source4/build/m4/core.m4
index 215ca5195e..6471fc9e64 100644
--- a/source4/build/m4/core.m4
+++ b/source4/build/m4/core.m4
@@ -22,6 +22,7 @@ AC_DEFUN([_SMB_BUILD_CORE],
$PERL -I$srcdir/build <<\_SMB_ACEOF
use strict;
+my %SETTINGS;
my %INPUT;
use smb_build::main;
@@ -60,7 +61,7 @@ $SMB_INFO_BINARIES
$SMB_INFO_ENABLES
-smb_build_main(\%INPUT);
+smb_build_main(\%INPUT, \%SETTINGS);
_SMB_ACEOF
diff --git a/source4/build/smb_build/main.pm b/source4/build/smb_build/main.pm
index eb48ae0461..6e027af45a 100644
--- a/source4/build/smb_build/main.pm
+++ b/source4/build/smb_build/main.pm
@@ -16,9 +16,10 @@ use strict;
my $config_list = "config.list";
-sub smb_build_main($)
+sub smb_build_main($$)
{
my $INPUT = shift;
+ my $settings = shift;
my @mkfiles = split('\n', `grep -v ^# $config_list`);
@@ -32,7 +33,7 @@ sub smb_build_main($)
my $OUTPUT = output::create_output($DEPEND);
- makefile::create_makefile_in($OUTPUT, "Makefile.in");
+ makefile::create_makefile_in($OUTPUT, $settings, "Makefile.in");
smb_build_h::create_smb_build_h($OUTPUT, "include/smb_build.h");
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index aba23be2eb..ddbfb7889e 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -737,9 +737,10 @@ sub _prepare_rule_lists($)
# $OUTPUT - the global OUTPUT context
#
# $output - the resulting output buffer
-sub _prepare_makefile_in($)
+sub _prepare_makefile_in($$)
{
my $CTX = shift;
+ my $settings = shift;
my $output;
$output = "########################################\n";
@@ -791,13 +792,14 @@ sub _prepare_makefile_in($)
# $OUTPUT - the global OUTPUT context
#
# $output - the resulting output buffer
-sub create_makefile_in($$)
+sub create_makefile_in($$$)
{
my $CTX = shift;
+ my $settings = shift;
my $file = shift;
open(MAKEFILE_IN,">$file") || die ("Can't open $file\n");
- print MAKEFILE_IN _prepare_makefile_in($CTX);
+ print MAKEFILE_IN _prepare_makefile_in($CTX, $settings);
close(MAKEFILE_IN);
print "config.smb_build.pl: creating $file\n";