[GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.

[jra/samba/.git] / source3 / script / mkbuildoptions.awk

diff --git a/source3/script/mkbuildoptions.awk b/source3/script/mkbuildoptions.awk
index e47664add41a865045fe62c3b5a83bd19f2cc794..383891d2e0c1b7b28fafd6ea2091bcf500c33052 100644 (file)
--- 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,";
@@ -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 <http://www.gnu.org/licenses/>."
        print "*/";
        print "";
        print "#include \"includes.h\"";
@@ -25,6 +24,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 "/****************************************************************************";
@@ -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\",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 "#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