From 3e85b960fae391af7a0592d5d38c18ae5a157209 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 27 Apr 2011 16:39:42 +1000 Subject: dynconfig: Have only one dynconfig.o in the common code. --- source3/script/mkbuildoptions.awk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/script/mkbuildoptions.awk') diff --git a/source3/script/mkbuildoptions.awk b/source3/script/mkbuildoptions.awk index 1955a80b46c..3cd0dace213 100644 --- a/source3/script/mkbuildoptions.awk +++ b/source3/script/mkbuildoptions.awk @@ -21,7 +21,7 @@ BEGIN { print ""; print "#include \"includes.h\""; print "#include \"build_env.h\""; - print "#include \"dynconfig.h\""; + print "#include \"dynconfig/dynconfig.h\""; print ""; print "static int output(bool screen, const char *format, ...) PRINTF_ATTRIBUTE(2,3);"; print "void build_options(bool screen);"; -- cgit From 7e8f086798c36f64581ed7444df535e85fa0b5af Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 9 May 2011 10:59:15 +0200 Subject: s3-build: Move generated config.h and config.h.in to include/autoconf This ensures that these are not found by the waf build, which causes issues when the wrong config.h is used by the recursive smbtorture build Andrew Bartlett --- source3/script/mkbuildoptions.awk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/script/mkbuildoptions.awk') diff --git a/source3/script/mkbuildoptions.awk b/source3/script/mkbuildoptions.awk index 3cd0dace213..0b1b2ef3ab8 100644 --- a/source3/script/mkbuildoptions.awk +++ b/source3/script/mkbuildoptions.awk @@ -235,7 +235,7 @@ function output(ARRAY, ELEMENTS, TITLE) { END { ################################################## # add code to show various options - print "/* Output various other options (as gleaned from include/config.h.in) */"; + print "/* Output various other options (as gleaned from include/autoconf/config.h.in) */"; output(sys_ary, sys_i, "System Headers"); output(headers_ary, headers_i, "Headers"); output(utmp_ary, utmp_i, "UTMP Options"); -- cgit