Author: jelmer Date: 2005-06-20 23:11:48 +0000 (Mon, 20 Jun 2005) New Revision: 7790
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7790 Log: Allow remembering more configure-level data (and remember --enable-develop for now). Modified: branches/SAMBA_4_0/source/build/m4/check_path.m4 branches/SAMBA_4_0/source/build/m4/core.m4 branches/SAMBA_4_0/source/build/smb_build/main.pm branches/SAMBA_4_0/source/build/smb_build/makefile.pm Changeset: Modified: branches/SAMBA_4_0/source/build/m4/check_path.m4 =================================================================== --- branches/SAMBA_4_0/source/build/m4/check_path.m4 2005-06-20 22:13:19 UTC (rev 7789) +++ branches/SAMBA_4_0/source/build/m4/check_path.m4 2005-06-20 23:11:48 UTC (rev 7790) @@ -137,6 +137,8 @@ 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 Modified: branches/SAMBA_4_0/source/build/m4/core.m4 =================================================================== --- branches/SAMBA_4_0/source/build/m4/core.m4 2005-06-20 22:13:19 UTC (rev 7789) +++ branches/SAMBA_4_0/source/build/m4/core.m4 2005-06-20 23:11:48 UTC (rev 7790) @@ -22,6 +22,7 @@ $PERL -I$srcdir/build <<\_SMB_ACEOF use strict; +my %SETTINGS; my %INPUT; use smb_build::main; @@ -60,7 +61,7 @@ $SMB_INFO_ENABLES -smb_build_main(\%INPUT); +smb_build_main(\%INPUT, \%SETTINGS); _SMB_ACEOF Modified: branches/SAMBA_4_0/source/build/smb_build/main.pm =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/main.pm 2005-06-20 22:13:19 UTC (rev 7789) +++ branches/SAMBA_4_0/source/build/smb_build/main.pm 2005-06-20 23:11:48 UTC (rev 7790) @@ -16,9 +16,10 @@ 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 @@ 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"); Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-06-20 22:13:19 UTC (rev 7789) +++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-06-20 23:11:48 UTC (rev 7790) @@ -737,9 +737,10 @@ # $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 @@ # $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";
