From 53004910ebe729809e7d3c9724f338d1b763be9b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 23 Apr 2003 14:19:03 +0000 Subject: Patch by Vance Lankhaar to automaticly regenerate the build options, so we will always have the right values for how and when an smbd was built. In particular, this is indended to address bitrot caused by configure.in changes. Andrew Bartlett (This used to be commit 2be258071c71986ba9af01e9a09ec49909a620dd) --- source3/script/mkbuildoptions.awk | 262 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 262 insertions(+) create mode 100644 source3/script/mkbuildoptions.awk (limited to 'source3/script/mkbuildoptions.awk') diff --git a/source3/script/mkbuildoptions.awk b/source3/script/mkbuildoptions.awk new file mode 100644 index 0000000000..391fdf531e --- /dev/null +++ b/source3/script/mkbuildoptions.awk @@ -0,0 +1,262 @@ +BEGIN { + print "/* "; + print " Unix SMB/CIFS implementation."; + print " Build Options for Samba Suite"; + print " Copyright (C) Vance Lankhaar 2003"; + print " Copyright (C) Andrew Bartlett 2001"; + print " "; + print " This program is free software; you can redistribute it and/or modify"; + print " it under the terms of the GNU General Public License as published by"; + print " the Free Software Foundation; either version 2 of the License, or"; + print " (at your option) any later version."; + print " "; + print " This program is distributed in the hope that it will be useful,"; + print " but WITHOUT ANY WARRANTY; without even the implied warranty of"; + print " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the"; + print " GNU General Public License for more details."; + print " "; + print " You should have received a copy of the GNU General Public License"; + print " along with this program; if not, write to the Free Software"; + print " Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."; + print "*/"; + print ""; + print "#include \"includes.h\""; + print "#include \"build_env.h\""; + print "#include \"dynconfig.h\""; + print ""; + print "static void output(BOOL screen, const char *format, ...) PRINTF_ATTRIBUTE(2,3);"; + print ""; + print ""; + print "/****************************************************************************"; + print "helper function for build_options"; + print "****************************************************************************/"; + print "static void output(BOOL screen, const char *format, ...)"; + print "{"; + print " char *ptr;"; + print " va_list ap;"; + print " "; + print " va_start(ap, format);"; + print " vasprintf(&ptr,format,ap);"; + print " va_end(ap);"; + print ""; + print " if (screen) {"; + print " d_printf(\"%s\", ptr);"; + print " } else {"; + print " DEBUG(4,(\"%s\", ptr));"; + print " }"; + print " "; + print " SAFE_FREE(ptr);"; + print "}"; + print ""; + print "/****************************************************************************"; + print "options set at build time for the samba suite"; + print "****************************************************************************/"; + print "void build_options(BOOL screen)"; + print "{"; + print " if ((DEBUGLEVEL < 4) && (!screen)) {"; + print " return;"; + print " }"; + print ""; + print "#ifdef _BUILD_ENV_H"; + print " /* Output information about the build environment */"; + print " output(screen,\"Build environment:\\n\");"; + print " output(screen,\" Built by: %s@%s\\n\",BUILD_ENV_USER,BUILD_ENV_HOST);"; + print " output(screen,\" Built on: %s\\n\",BUILD_ENV_DATE);"; + print ""; + print " output(screen,\" Built using: %s\\n\",BUILD_ENV_COMPILER);"; + print " output(screen,\" Build host: %s\\n\",BUILD_ENV_UNAME);"; + print " output(screen,\" SRCDIR: %s\\n\",BUILD_ENV_SRCDIR);"; + print " output(screen,\" BUILDDIR: %s\\n\",BUILD_ENV_BUILDDIR);"; + print ""; + print " "; + print "#endif"; + print ""; + + print " /* Output various paths to files and directories */"; + print " output(screen,\"\\nPaths:\\n\");"; + + print " output(screen,\" SBINDIR: %s\\n\", dyn_SBINDIR);"; + print " output(screen,\" BINDIR: %s\\n\", dyn_BINDIR);"; + print " output(screen,\" SWATDIR: %s\\n\", dyn_SWATDIR);"; + + print " output(screen,\" CONFIGFILE: %s\\n\", dyn_CONFIGFILE);"; + print " output(screen,\" LOGFILEBASE: %s\\n\", dyn_LOGFILEBASE);"; + print " output(screen,\" LMHOSTSFILE: %s\\n\",dyn_LMHOSTSFILE);"; + + print " output(screen,\" LIBDIR: %s\\n\",dyn_LIBDIR);"; + print " output(screen,\" SHLIBEXT: %s\\n\",dyn_SHLIBEXT);"; + + print " output(screen,\" LOCKDIR: %s\\n\",dyn_LOCKDIR);"; + print " output(screen,\" PIDDIR: %s\\n\", dyn_PIDDIR);"; + + print " output(screen,\" SMB_PASSWD_FILE: %s\\n\",dyn_SMB_PASSWD_FILE);"; + print " output(screen,\" PRIVATE_DIR: %s\\n\",dyn_PRIVATE_DIR);"; + print ""; + + +################################################## +# predefine first element of *_ary +# predefine *_i (num of elements in *_ary) + with_ary[0]=""; + with_i=0; + have_ary[0]=""; + have_i=0; + utmp_ary[0]=""; + utmp_i=0; + misc_ary[0]=""; + misc_i=0; + sys_ary[0]=""; + sys_i=0; + headers_ary[0]=""; + headers_i=0; + in_comment = 0; +} + +# capture single line comments +/^\/\* (.*?)\*\// { + last_comment = $0; + next; +} + +# end capture multi-line comments +/(.*?)\*\// { + last_comment = last_comment $0; + in_comment = 0; + next; +} + +# capture middle lines of multi-line comments +in_comment { + last_comment = last_comment $0; + next; +} + +# begin capture multi-line comments +/^\/\* (.*?)/ { + last_comment = $0; + in_comment = 1; + next +} + +################################################## +# if we have an #undef and a last_comment, store it +/^\#undef/ { + split($0,a); + comments_ary[a[2]] = last_comment; + last_comment = ""; +} + +################################################## +# for each line, sort into appropriate section +# then move on + +/^\#undef WITH/ { + with_ary[with_i++] = a[2]; + # we want (I think) to allow --with to show up in more than one place, so no next +} + + +/^\#undef HAVE_UT_UT_/ || /^\#undef .*UTMP/ { + utmp_ary[utmp_i++] = a[2]; + next; +} + +/^\#undef HAVE_SYS_.*?_H$/ { + sys_ary[sys_i++] = a[2]; + next; +} + +/^\#undef HAVE_.*?_H$/ { + headers_ary[headers_i++] = a[2]; + next; +} + +/^\#undef HAVE_/ { + have_ary[have_i++] = a[2]; + next; +} + +/^\#undef/ { + misc_ary[misc_i++] = a[2]; + next; +} + + +################################################## +# simple sort function +function sort(ARRAY, ELEMENTS) { + for (i = 1; i <= ELEMENTS; ++i) { + for (j = i; (j-1) in ARRAY && (j) in ARRAY && ARRAY[j-1] > ARRAY[j]; --j) { + temp = ARRAY[j]; + ARRAY[j] = ARRAY[j-1]; + ARRAY[j-1] = temp; + } + } + return; +} + + +################################################## +# output code from list of defined +# expects: ARRAY an array of things defined +# ELEMENTS number of elements in ARRAY +# TITLE title for section +# returns: nothing +function output(ARRAY, ELEMENTS, TITLE) { + + # add section header + print "\n\t/* Show " TITLE " */"; + print "\toutput(screen, \"\\n " TITLE ":\\n\");\n"; + + + # sort element using bubble sort (slow, but easy) + sort(ARRAY, ELEMENTS); + + # loop through array of defines, outputting code + for (i = 0; i < ELEMENTS; i++) { + print "#ifdef " ARRAY[i]; + + # I don't know which one to use.... + + print "\toutput(screen, \" " ARRAY[i] "\\n\");"; + #printf "\toutput(screen, \" %s\\n %s\\n\\n\");\n", comments_ary[ARRAY[i]], ARRAY[i]; + #printf "\toutput(screen, \" %-35s %s\\n\");\n", ARRAY[i], comments_ary[ARRAY[i]]; + + print "#endif"; + } + return; +} + +END { + ################################################## + # add code to show various options + print "/* Output various other options (as gleaned from include/config.h.in) */"; + output(sys_ary, sys_i, "System Headers"); + output(headers_ary, headers_i, "Headers"); + output(utmp_ary, utmp_i, "UTMP Options"); + output(have_ary, have_i, "HAVE_* Defines"); + output(with_ary, with_i, "--with Options"); + output(misc_ary, misc_i, "Build Options"); + + ################################################## + # add code to display the various type sizes + print " /* Output the sizes of the various types */"; + print " output(screen, \"\\nType sizes:\\n\");"; + print " output(screen, \" sizeof(char): %d\\n\",sizeof(char));"; + print " output(screen, \" sizeof(int): %d\\n\",sizeof(int));"; + print " output(screen, \" sizeof(long): %d\\n\",sizeof(long));"; + print " output(screen, \" sizeof(uint8): %d\\n\",sizeof(uint8));"; + print " output(screen, \" sizeof(uint16): %d\\n\",sizeof(uint16));"; + print " output(screen, \" sizeof(uint32): %d\\n\",sizeof(uint32));"; + print " output(screen, \" sizeof(short): %d\\n\",sizeof(short));"; + print " output(screen, \" sizeof(void*): %d\\n\",sizeof(void*));"; + + ################################################## + # add code to give information about modules + print " output(screen, \"\\nBuiltin modules:\\n\");"; + print " output(screen, \" %s\\n\", STRING_STATIC_MODULES);"; + + print "}"; + +} + -- cgit From df31340b5d751854545259839ad8d38a95e5efae Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 29 Apr 2003 03:04:05 +0000 Subject: Fix for format string warning from vance (This used to be commit 0369d4432b9700626b6853dae8c93770bb1bcd59) --- source3/script/mkbuildoptions.awk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source3/script/mkbuildoptions.awk') diff --git a/source3/script/mkbuildoptions.awk b/source3/script/mkbuildoptions.awk index 391fdf531e..cdc5bd9881 100644 --- a/source3/script/mkbuildoptions.awk +++ b/source3/script/mkbuildoptions.awk @@ -242,14 +242,14 @@ END { # add code to display the various type sizes print " /* Output the sizes of the various types */"; print " output(screen, \"\\nType sizes:\\n\");"; - print " output(screen, \" sizeof(char): %d\\n\",sizeof(char));"; - print " output(screen, \" sizeof(int): %d\\n\",sizeof(int));"; - print " output(screen, \" sizeof(long): %d\\n\",sizeof(long));"; - print " output(screen, \" sizeof(uint8): %d\\n\",sizeof(uint8));"; - print " output(screen, \" sizeof(uint16): %d\\n\",sizeof(uint16));"; - print " output(screen, \" sizeof(uint32): %d\\n\",sizeof(uint32));"; - print " output(screen, \" sizeof(short): %d\\n\",sizeof(short));"; - print " output(screen, \" sizeof(void*): %d\\n\",sizeof(void*));"; + print " output(screen, \" sizeof(char): %u\\n\",sizeof(char));"; + print " output(screen, \" sizeof(int): %u\\n\",sizeof(int));"; + print " output(screen, \" sizeof(long): %u\\n\",sizeof(long));"; + print " output(screen, \" sizeof(uint8): %u\\n\",sizeof(uint8));"; + print " output(screen, \" sizeof(uint16): %u\\n\",sizeof(uint16));"; + print " output(screen, \" sizeof(uint32): %u\\n\",sizeof(uint32));"; + print " output(screen, \" sizeof(short): %u\\n\",sizeof(short));"; + print " output(screen, \" sizeof(void*): %u\\n\",sizeof(void*));"; ################################################## # add code to give information about modules -- cgit From f95e40197f7d1f882796de9ed83e61d79b21f256 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Tue, 4 Nov 2003 19:47:40 +0000 Subject: Generate 64-bit clean printf's for build options. (This used to be commit 1814c29b7d5c2ab25f209fba0afb5c6d175a87d1) --- source3/script/mkbuildoptions.awk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source3/script/mkbuildoptions.awk') diff --git a/source3/script/mkbuildoptions.awk b/source3/script/mkbuildoptions.awk index cdc5bd9881..e47664add4 100644 --- a/source3/script/mkbuildoptions.awk +++ b/source3/script/mkbuildoptions.awk @@ -242,14 +242,14 @@ END { # add code to display the various type sizes print " /* Output the sizes of the various types */"; print " output(screen, \"\\nType sizes:\\n\");"; - print " output(screen, \" sizeof(char): %u\\n\",sizeof(char));"; - print " output(screen, \" sizeof(int): %u\\n\",sizeof(int));"; - print " output(screen, \" sizeof(long): %u\\n\",sizeof(long));"; - print " output(screen, \" sizeof(uint8): %u\\n\",sizeof(uint8));"; - print " output(screen, \" sizeof(uint16): %u\\n\",sizeof(uint16));"; - print " output(screen, \" sizeof(uint32): %u\\n\",sizeof(uint32));"; - print " output(screen, \" sizeof(short): %u\\n\",sizeof(short));"; - print " output(screen, \" sizeof(void*): %u\\n\",sizeof(void*));"; + print " output(screen, \" sizeof(char): %lu\\n\",sizeof(char));"; + print " output(screen, \" sizeof(int): %lu\\n\",sizeof(int));"; + print " output(screen, \" sizeof(long): %lu\\n\",sizeof(long));"; + print " output(screen, \" sizeof(uint8): %lu\\n\",sizeof(uint8));"; + print " output(screen, \" sizeof(uint16): %lu\\n\",sizeof(uint16));"; + print " output(screen, \" sizeof(uint32): %lu\\n\",sizeof(uint32));"; + print " output(screen, \" sizeof(short): %lu\\n\",sizeof(short));"; + print " output(screen, \" sizeof(void*): %lu\\n\",sizeof(void*));"; ################################################## # add code to give information about modules -- cgit From 9f154119e8788e9c3525b0a61c64326abd35bdf6 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Thu, 6 Nov 2003 22:11:08 +0000 Subject: Final round of printf warnings fixes for the moment. (This used to be commit 0519a7022b4979c0e8ddd4907f4b858a59299c06) --- source3/script/mkbuildoptions.awk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source3/script/mkbuildoptions.awk') diff --git a/source3/script/mkbuildoptions.awk b/source3/script/mkbuildoptions.awk index e47664add4..9c22662310 100644 --- a/source3/script/mkbuildoptions.awk +++ b/source3/script/mkbuildoptions.awk @@ -242,14 +242,14 @@ END { # add code to display the various type sizes print " /* Output the sizes of the various types */"; print " output(screen, \"\\nType sizes:\\n\");"; - print " output(screen, \" sizeof(char): %lu\\n\",sizeof(char));"; - print " output(screen, \" sizeof(int): %lu\\n\",sizeof(int));"; - print " output(screen, \" sizeof(long): %lu\\n\",sizeof(long));"; - print " output(screen, \" sizeof(uint8): %lu\\n\",sizeof(uint8));"; - print " output(screen, \" sizeof(uint16): %lu\\n\",sizeof(uint16));"; - print " output(screen, \" sizeof(uint32): %lu\\n\",sizeof(uint32));"; - print " output(screen, \" sizeof(short): %lu\\n\",sizeof(short));"; - print " output(screen, \" sizeof(void*): %lu\\n\",sizeof(void*));"; + print " output(screen, \" sizeof(char): %lu\\n\",(unsigned long)sizeof(char));"; + print " output(screen, \" sizeof(int): %lu\\n\",(unsigned long)sizeof(int));"; + print " output(screen, \" sizeof(long): %lu\\n\",(unsigned long)sizeof(long));"; + print " output(screen, \" sizeof(uint8): %lu\\n\",(unsigned long)sizeof(uint8));"; + print " output(screen, \" sizeof(uint16): %lu\\n\",(unsigned long)sizeof(uint16));"; + print " output(screen, \" sizeof(uint32): %lu\\n\",(unsigned long)sizeof(uint32));"; + print " output(screen, \" sizeof(short): %lu\\n\",(unsigned long)sizeof(short));"; + print " output(screen, \" sizeof(void*): %lu\\n\",(unsigned long)sizeof(void*));"; ################################################## # add code to give information about modules -- cgit From 78359305491f869af13622153bdf21cdb0cc2459 Mon Sep 17 00:00:00 2001 From: James Peach Date: Fri, 5 May 2006 03:07:00 +0000 Subject: r15447: Teach "smbd -b" to emit the sizes of a few more types that might be interesting. Push the spacing across a bit so that it all lines up nicely. (This used to be commit efd961e4eefb774c7bdaef098e2b67062a7dffd3) --- source3/script/mkbuildoptions.awk | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'source3/script/mkbuildoptions.awk') diff --git a/source3/script/mkbuildoptions.awk b/source3/script/mkbuildoptions.awk index 9c22662310..1e7b74b8d9 100644 --- a/source3/script/mkbuildoptions.awk +++ b/source3/script/mkbuildoptions.awk @@ -242,14 +242,21 @@ END { # add code to display the various type sizes print " /* Output the sizes of the various types */"; print " output(screen, \"\\nType sizes:\\n\");"; - print " output(screen, \" sizeof(char): %lu\\n\",(unsigned long)sizeof(char));"; - print " output(screen, \" sizeof(int): %lu\\n\",(unsigned long)sizeof(int));"; - print " output(screen, \" sizeof(long): %lu\\n\",(unsigned long)sizeof(long));"; - print " output(screen, \" sizeof(uint8): %lu\\n\",(unsigned long)sizeof(uint8));"; - print " output(screen, \" sizeof(uint16): %lu\\n\",(unsigned long)sizeof(uint16));"; - print " output(screen, \" sizeof(uint32): %lu\\n\",(unsigned long)sizeof(uint32));"; - print " output(screen, \" sizeof(short): %lu\\n\",(unsigned long)sizeof(short));"; - print " output(screen, \" sizeof(void*): %lu\\n\",(unsigned long)sizeof(void*));"; + print " output(screen, \" sizeof(char): %lu\\n\",(unsigned long)sizeof(char));"; + print " output(screen, \" sizeof(int): %lu\\n\",(unsigned long)sizeof(int));"; + print " output(screen, \" sizeof(long): %lu\\n\",(unsigned long)sizeof(long));"; + print "#if HAVE_LONGLONG" + print " output(screen, \" sizeof(long long): %lu\\n\",(unsigned long)sizeof(long long));"; + print "#endif" + print " output(screen, \" sizeof(uint8): %lu\\n\",(unsigned long)sizeof(uint8));"; + print " output(screen, \" sizeof(uint16): %lu\\n\",(unsigned long)sizeof(uint16));"; + print " output(screen, \" sizeof(uint32): %lu\\n\",(unsigned long)sizeof(uint32));"; + print " output(screen, \" sizeof(short): %lu\\n\",(unsigned long)sizeof(short));"; + print " output(screen, \" sizeof(void*): %lu\\n\",(unsigned long)sizeof(void*));"; + print " output(screen, \" sizeof(size_t): %lu\\n\",(unsigned long)sizeof(size_t));"; + print " output(screen, \" sizeof(off_t): %lu\\n\",(unsigned long)sizeof(off_t));"; + print " output(screen, \" sizeof(ino_t): %lu\\n\",(unsigned long)sizeof(ino_t));"; + print " output(screen, \" sizeof(dev_t): %lu\\n\",(unsigned long)sizeof(dev_t));"; ################################################## # add code to give information about modules -- cgit From e59e787b4868acffad49b6264e319d585643d5ab Mon Sep 17 00:00:00 2001 From: Herb Lewis Date: Wed, 20 Dec 2006 01:10:04 +0000 Subject: r20269: merge -r20264:20267 from SAMBA_3_0_24 more no previous prototype warnings (This used to be commit 41be182f78762372ae13759ede5d2bd40a71d7f5) --- source3/script/mkbuildoptions.awk | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/script/mkbuildoptions.awk') diff --git a/source3/script/mkbuildoptions.awk b/source3/script/mkbuildoptions.awk index 1e7b74b8d9..20b20384a2 100644 --- a/source3/script/mkbuildoptions.awk +++ b/source3/script/mkbuildoptions.awk @@ -25,6 +25,7 @@ BEGIN { print "#include \"dynconfig.h\""; print ""; print "static void output(BOOL screen, const char *format, ...) PRINTF_ATTRIBUTE(2,3);"; + print "void build_options(BOOL screen);"; print ""; print ""; print "/****************************************************************************"; -- cgit From 2a9b4da0fa00d4ada504f49fafcadab7b0094331 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 9 Jul 2007 19:46:27 +0000 Subject: r23780: Find and fix more GPL2 -> GPL3. Jeremy. (This used to be commit c2f7ab1c175ecff0cf44d0bbc4763ba9f7d7803f) --- 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 20b20384a2..c8f252a34f 100644 --- a/source3/script/mkbuildoptions.awk +++ b/source3/script/mkbuildoptions.awk @@ -7,7 +7,7 @@ BEGIN { print " "; print " This program is free software; you can redistribute it and/or modify"; print " it under the terms of the GNU General Public License as published by"; - print " the Free Software Foundation; either version 2 of the License, or"; + print " the Free Software Foundation; either version 3 of the License, or"; print " (at your option) any later version."; print " "; print " This program is distributed in the hope that it will be useful,"; -- cgit From 153cfb9c83534b09f15cc16205d7adb19b394928 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 10 Jul 2007 05:23:25 +0000 Subject: r23801: The FSF has moved around a lot. This fixes their Mass Ave address. (This used to be commit 87c91e4362c51819032bfbebbb273c52e203b227) --- source3/script/mkbuildoptions.awk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source3/script/mkbuildoptions.awk') diff --git a/source3/script/mkbuildoptions.awk b/source3/script/mkbuildoptions.awk index c8f252a34f..56b64a42c2 100644 --- a/source3/script/mkbuildoptions.awk +++ b/source3/script/mkbuildoptions.awk @@ -16,8 +16,7 @@ BEGIN { print " GNU General Public License for more details."; print " "; print " You should have received a copy of the GNU General Public License"; - print " along with this program; if not, write to the Free Software"; - print " Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."; + print " along with this program; if not, see "; print "*/"; print ""; print "#include \"includes.h\""; -- cgit From e5a951325a6cac8567af3a66de6d2df577508ae4 Mon Sep 17 00:00:00 2001 From: "Gerald (Jerry) Carter" Date: Wed, 10 Oct 2007 15:34:30 -0500 Subject: [GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch. (This used to be commit 5c6c8e1fe93f340005110a7833946191659d88ab) --- 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 56b64a42c2..383891d2e0 100644 --- a/source3/script/mkbuildoptions.awk +++ b/source3/script/mkbuildoptions.awk @@ -16,7 +16,7 @@ BEGIN { print " GNU General Public License for more details."; print " "; print " You should have received a copy of the GNU General Public License"; - print " along with this program; if not, see "; + print " along with this program; if not, see ." print "*/"; print ""; print "#include \"includes.h\""; -- cgit From 30191d1a5704ad2b158386b511558972d539ce47 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 18 Oct 2007 17:40:25 -0700 Subject: RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in various places whilst doing this (places that assumed BOOL == int). I also need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f) --- source3/script/mkbuildoptions.awk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/script/mkbuildoptions.awk') diff --git a/source3/script/mkbuildoptions.awk b/source3/script/mkbuildoptions.awk index 383891d2e0..21c4bfac85 100644 --- a/source3/script/mkbuildoptions.awk +++ b/source3/script/mkbuildoptions.awk @@ -23,14 +23,14 @@ BEGIN { print "#include \"build_env.h\""; print "#include \"dynconfig.h\""; print ""; - print "static void output(BOOL screen, const char *format, ...) PRINTF_ATTRIBUTE(2,3);"; - print "void build_options(BOOL screen);"; + print "static void output(bool screen, const char *format, ...) PRINTF_ATTRIBUTE(2,3);"; + print "void build_options(bool screen);"; print ""; print ""; print "/****************************************************************************"; print "helper function for build_options"; print "****************************************************************************/"; - print "static void output(BOOL screen, const char *format, ...)"; + print "static void output(bool screen, const char *format, ...)"; print "{"; print " char *ptr;"; print " va_list ap;"; @@ -51,7 +51,7 @@ BEGIN { print "/****************************************************************************"; print "options set at build time for the samba suite"; print "****************************************************************************/"; - print "void build_options(BOOL screen)"; + print "void build_options(bool screen)"; print "{"; print " if ((DEBUGLEVEL < 4) && (!screen)) {"; print " return;"; -- cgit From 97cbaceec1314b4918488e959c9eff9bb4b99166 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 10 Dec 2007 11:37:20 -0800 Subject: Forgot build options was generated... fix. Jeremy. (This used to be commit d78e081043124bbd80cf56d4a991ddf24ff46ef6) --- source3/script/mkbuildoptions.awk | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'source3/script/mkbuildoptions.awk') diff --git a/source3/script/mkbuildoptions.awk b/source3/script/mkbuildoptions.awk index 21c4bfac85..c4e257f64d 100644 --- a/source3/script/mkbuildoptions.awk +++ b/source3/script/mkbuildoptions.awk @@ -75,22 +75,22 @@ BEGIN { print " /* Output various paths to files and directories */"; print " output(screen,\"\\nPaths:\\n\");"; - print " output(screen,\" SBINDIR: %s\\n\", dyn_SBINDIR);"; - print " output(screen,\" BINDIR: %s\\n\", dyn_BINDIR);"; - print " output(screen,\" SWATDIR: %s\\n\", dyn_SWATDIR);"; + print " output(screen,\" SBINDIR: %s\\n\", get_dyn_SBINDIR());"; + print " output(screen,\" BINDIR: %s\\n\", get_dyn_BINDIR());"; + print " output(screen,\" SWATDIR: %s\\n\", get_dyn_SWATDIR());"; - print " output(screen,\" CONFIGFILE: %s\\n\", dyn_CONFIGFILE);"; - print " output(screen,\" LOGFILEBASE: %s\\n\", dyn_LOGFILEBASE);"; - print " output(screen,\" LMHOSTSFILE: %s\\n\",dyn_LMHOSTSFILE);"; + print " output(screen,\" CONFIGFILE: %s\\n\", get_dyn_CONFIGFILE());"; + print " output(screen,\" LOGFILEBASE: %s\\n\", get_dyn_LOGFILEBASE());"; + print " output(screen,\" LMHOSTSFILE: %s\\n\",get_dyn_LMHOSTSFILE());"; - print " output(screen,\" LIBDIR: %s\\n\",dyn_LIBDIR);"; - print " output(screen,\" SHLIBEXT: %s\\n\",dyn_SHLIBEXT);"; + print " output(screen,\" LIBDIR: %s\\n\",get_dyn_LIBDIR());"; + print " output(screen,\" SHLIBEXT: %s\\n\",get_dyn_SHLIBEXT());"; - print " output(screen,\" LOCKDIR: %s\\n\",dyn_LOCKDIR);"; - print " output(screen,\" PIDDIR: %s\\n\", dyn_PIDDIR);"; + print " output(screen,\" LOCKDIR: %s\\n\",get_dyn_LOCKDIR());"; + print " output(screen,\" PIDDIR: %s\\n\", get_dyn_PIDDIR());"; - print " output(screen,\" SMB_PASSWD_FILE: %s\\n\",dyn_SMB_PASSWD_FILE);"; - print " output(screen,\" PRIVATE_DIR: %s\\n\",dyn_PRIVATE_DIR);"; + print " output(screen,\" SMB_PASSWD_FILE: %s\\n\",get_dyn_SMB_PASSWD_FILE());"; + print " output(screen,\" PRIVATE_DIR: %s\\n\",get_dyn_PRIVATE_DIR());"; print ""; -- cgit From e069372ef887fdbb2985a926f2c4d4db17835522 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 15 Aug 2008 00:46:46 +0200 Subject: buildoptions: output MODULESDIR. Michael (This used to be commit bcb868e4340a856c4009450479628088a8a1628c) --- source3/script/mkbuildoptions.awk | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/script/mkbuildoptions.awk') diff --git a/source3/script/mkbuildoptions.awk b/source3/script/mkbuildoptions.awk index c4e257f64d..02562cf7b2 100644 --- a/source3/script/mkbuildoptions.awk +++ b/source3/script/mkbuildoptions.awk @@ -84,6 +84,7 @@ BEGIN { print " output(screen,\" LMHOSTSFILE: %s\\n\",get_dyn_LMHOSTSFILE());"; print " output(screen,\" LIBDIR: %s\\n\",get_dyn_LIBDIR());"; + print " output(screen,\" MODULESDIR: %s\\n\",get_dyn_MODULESDIR());"; print " output(screen,\" SHLIBEXT: %s\\n\",get_dyn_SHLIBEXT());"; print " output(screen,\" LOCKDIR: %s\\n\",get_dyn_LOCKDIR());"; -- cgit