diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-06-20 23:11:48 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:18:36 -0500 |
| commit | 331aaa52562f0676224f1b00f7e306210797c790 (patch) | |
| tree | a08aea9d0d81a2512f96abd174bc241fa903792d /source4/build/smb_build | |
| parent | b7be627e35b81fb2df8cdd83d129713aa8f0127a (diff) | |
| download | samba-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)
Diffstat (limited to 'source4/build/smb_build')
| -rw-r--r-- | source4/build/smb_build/main.pm | 5 | ||||
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 8 |
2 files changed, 8 insertions, 5 deletions
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"; |