Long overdue, I've finished up some small changes to the sundry READMEs in the metaconfig repository. I've taken the three READMEs: README, U/README, and U/README.dist, and turned them into two less-redundant and (I hope) slightly more accurate versions. I've also gotten rid of old, unused units (the almost, but not quite duplicated site*dir.U units).
There's also one NEW file here, metaconfig/U.check/README, which is an attempt to explain the point of the U.check directory. Lastly, I applied the unofficial dist patch 'c' to the dist units, though that's probably largely irrelevant for perl since we have private copies of most of those units anyway. I don't have write permission to the repository, so someone else is going to have to actually check all this in. Share and enjoy, #!/bin/sh # These are all out-dated almost duplicates. rm metaconfig/U/README.dist rm metaconfig/U/installdirs/sitehtml1dir.U rm metaconfig/U/installdirs/sitehtml3dir.U rm metaconfig/U/installdirs/siteman1dir.U rm metaconfig/U/installdirs/siteman3dir.U rm metaconfig/U/installdirs/sitescriptdir.U exit 0 diff -P -u -r metaconfig/README metaconfig-andy/README --- metaconfig/README Fri Sep 6 14:07:42 2002 +++ metaconfig-andy/README Fri Sep 6 13:57:21 2002 @@ -1,4 +1,9 @@ -Jarrko's How to build Configure tweaked by Nick. + Jarrko's How to build Configure tweaked by Nick. + +The Configure script and config_h.SH file in the Perl distribution are +generated by a program called metaconfig. Metaconfig was originally +written by Larry Wall, and was subsequently enhanced and maintained +by Raphael Manfredi. You have presumably obtained the metaconfig from the repository e.g. p4 sync //depot/metaconfig/... @@ -8,6 +13,24 @@ so ../perl will get you to perl and ../perl/../metaconfig will get you back here. +Contents of this directory: + + README: This file. + U: Metaconfig units used for buliding Perl's Configure + U.check: Sample directory used for testing new metaconfig units. + see U.check/README for more information. + dist-3.0at70: + dist-3.0 at patchlevel 70. This is the final version released + by Raphael Manfredi. Don't use it. Instead, use ... + dist-3.0at70b: + dist-3.0 at patchlevel 70 with unofficial patches 'a' and 'b' + applied. This version was never officially released, but + the patches are essential, so this is the version we use for + perl. Actually, I've also applied U/dist_patches/dist-p70c + to this tree. If someone with perforce access wants to change + the name of the directory, that'd be fine. Otherwise, it really + doesn't matter. + (a) You need to have dist installed so that you have metalint and metaconfig in your $PATH. The dist version used for perl is dist-3.0at70b in this directory. @@ -36,11 +59,13 @@ 1) have a symlink to ../metaconfig/U called U 2) have a symlink to ../metaconfig/.package called .package 3) have a symlink to MANIFEST called MANIFEST.new + 4) chmod +w Configure config_h.SH Porting/Glossary Porting/config* (c) Write the new unit as U/foo/bar.U (usually 'foo' is just 'perl', - but sometimes there's some more appropriate subdir of U) + but sometimes there's some more appropriate subdir of U. See + U/README for a description of the various subdirectories.) -(d) metalint to see nits: as opposed to lint, the gripings of +(d) Run metalint to see nits: as opposed to lint, the gripings of metalint are usually serious :-) and need fixing Exceptions are lots of @@ -65,15 +90,16 @@ For Win32 the process is semi-automated - if you have a Win32 machine to run dmake on ... -(h) then there's the running of mksample to freshen the Porting/config* - and Porting/Glossary, but I can't remember where the 'mksample' came - from, could be part of 'dist'. You can skip this phase, - it's not essential, just good housekeeping. - -(i) make veryclean;sh Configure -des -Dusedevel;make all test +(h) Edit U/mkglossary (right near the top) to point to where you keep + dist's standard metaconfig units as well as your perl-specific ones. -(j) p4 add ../metaconfig/foo/bar.U when you are ready ... +(i) Run U/mksample to freshen the Porting/config* and Porting/Glossary. + Adjust the various compile-time options (e.g. 64bit, threads) as + you see fit. + You can skip this phase, it's not essential, just good housekeeping. -(k) p4 submit +(j) make veryclean;sh Configure -des -Dusedevel;make all test +(k) p4 add ../metaconfig/foo/bar.U when you are ready ... +(l) p4 submit diff -P -u -r metaconfig/U/README metaconfig-andy/U/README --- metaconfig/U/README Fri Sep 6 14:07:43 2002 +++ metaconfig-andy/U/README Fri Sep 6 13:52:50 2002 @@ -4,73 +4,52 @@ Copyright (c) 1996-1998, Andy Dougherty All rights reserved. -These units are the ones I used to build Configure and config_h.SH +These units are the ones used to build Configure and config_h.SH in the Perl5 distribution. -The Configure script and config_h.SH file in the Perl distribution are -generated by a program called metaconfig. To run metaconfig, you will -need the full dist 3.0 distribution, maintained by Raphael Manfredi. -As of this writing, the current version is dist3.0, patchlevel 70. -Dist version [EMAIL PROTECTED] is available on CPAN (the Comprehensive -Perl Archive Network) as -<http:[EMAIL PROTECTED]>. +metaconfig will first look in its standard locations (specified when you +installed dist). It will then recurse through the 'U' subdirectory +and find any additional "private" units. Private units override +standard ones supplied with metaconfig. + +Files in this directory: + +README + This file. + +Glossary.patch + The standard dist units contain some strings that make pod2man + complain. This patch silences those warnings. As new units are + added and Configure is regenerated, this patch may need more and more + 'fuzz' to be applied. It should be freshly regenerated every once + in a while. + +mkglossary + A script to regenerate Porting/Glossary. You have to manually + edit the top of the script to point the location of your metaconfig + units. It is called automatically by 'mksample'. + +mksample + A script to regenerate Porting/config.sh and Porting/config.H. + It also calls mkglossary, if necessary. -Instructions: - -1. Unpack the full perl5 sources. Execute the following command - - chmod +w Configure config_h.SH Porting/Glossary Porting/config* - -2. Unpack the archive containing this file in the perl5 source - directory. This will create a directory 'U' under the perl5 - sources. That directory will contain the metaconfig units for perl5. - This will also create two files in the perl5 source tree: - MANIFEST.new and .package. - -3. Apply any patches to perl in the U/perl_patches directory. - (This may well be empty.) - -4a. Obtain dist-3.0pl70. - -4b. Apply any patches to dist under the U/dist_patches subdirectory. - -4c. Install dist. - -5. From your main perl5 source directory, run packinit to - regenerate the .package file. IMPORTANT: Change the name and - address of the maintainer to your own name and address. I don't - want bug reports intended for you coming to me. - -6. From your main perl5 source directory, run - - metaconfig -m - -7. Edit U/mkglossary to point to your dist-3.0pl70 location - (See comments at the top.) - -8. Run the U/mksample script to update the contents of the Porting/ - subdirectory. - -9. Let me know about any changes, corrections, or enhancements. - -Things to watch out for: - -1. The Configure in 5.005 is a hand-patched version of that supplied - with perl5.004_74 or so. Most of the patches had to do with - supporting MPE/iX and EBCDIC systems. I have re-integrated most - of the changes back into metaconfig, but I don't really undertand - why MPE/iX needed some of the patches, so I may have missed - something important. I did try to flag questionable changes in - the individual units. - -2. Future support of better random number generators should probably - start with the randfunc.U unit included here. It's currently - broken, but well commented and probably a good place to start. - -Descriptions: +Subdirectories: The units and other related files have been broken up into the following -directories: +directories. + +a_dvisory/ + These are units that have to go first in the generated config_h.SH. + A word of explanation: Configure and config_h.SH are generated from 'Units' + (the *.U files). Files indicate dependencies (using make(1)), and + Configure is built to follow those dependencies. However, config_h.SH + is simply built by putting all the units in alphabetical order and + extracting the relevant lines. (This could be fixed, I suppose, but + it wasn't trivial the one time I looked.) + The a_dvisory/ directory, then, is a place to put units that need + to be early in config_h.SH. (Most units are self-contained + and ought to be able to go anywhere. However, some things, like + byteorder, need to have the #defines from multiarch available.) acl/ This is an old patch to begin to detect and use ACL (access @@ -78,16 +57,20 @@ compline/ These are similar to the standard units, but I have modified them - to have a more uniform compile command line, usually using the new - Compile.U unit. I have submitted these for inclusion into the - regular dist distribution. (The ccflags.U unit is actually - perl-specific since it mentions -DDEBUGGING and -DPOSIX_SOURCE, - but that's the only place it is perl-specific.) + to have a more uniform compile command line, usually using the + new Compile.U unit. (The ccflags.U unit is perl-specific since it + mentions -DDEBUGGING and -DPOSIX_SOURCE, but that's the only place + it is perl-specific.) dist_patches/ These are patches to dist that must be applied before it is built and installed. I have submitted these for inclusion in the - regular dist distribution. + regular dist distribution. They have already been applied + to the ../dist-3.0at70b directory. + +ebcdic/ + These are units that had to be specially modified to work under + either EBCDIC or ASCII. installdirs/ These are units to handle perl's installation directories and @@ -117,23 +100,22 @@ protos/ These are units modified to use the new Hasproto.U or Protochk.U - units to check for prototypes. I have submitted these for inclusion - into the regular dist distribution. + units to check for prototypes. -target/ - This is the very, very beginning of cross-compiler support. - It doesn't work yet, and many standard units will need - modification. +threads/ + These are specific to threading perl. typedefs/ These are standard units modified to use the modified Typedef.U unit to check for typedefs. (The modified Typdef.U includes a function to avoid unnecessary prompts if the typdef being searched - for exists.) I have submitted these for inclusion into the - regular dist distribution. + for exists.) + -threads/ - These are specific to threading perl. +Where appropriate, I submitted these units for inclusion into the +regular dist distribution. However, since dist is no longer actively +maintained, and the alternative is for *me* to actively maintain it, +the units just sit here. Copyright Information: diff -P -u -r metaconfig/U/mksample metaconfig-andy/U/mksample --- metaconfig/U/mksample Fri Sep 6 14:08:08 2002 +++ metaconfig-andy/U/mksample Fri Sep 6 13:48:55 2002 @@ -30,6 +30,8 @@ perl mkglossary > $pwd/Porting/Glossary cd $pwd/Porting rm -f Glossary.rej + # The standard 'dist' units contain some strings that upset + # pod2man. This patch silences pod2man's warnings. patch < $pwd/U/Glossary.patch if test -f Glossary.rej; then echo 'Check possible failed patch to Porting/Glossary!' diff -P -u -r metaconfig/U.check/MANIFEST metaconfig-andy/U.check/MANIFEST --- metaconfig/U.check/MANIFEST Fri Sep 6 14:07:42 2002 +++ metaconfig-andy/U.check/MANIFEST Fri Sep 6 13:53:46 2002 @@ -1,5 +1,6 @@ MANIFEST This file. Makefile.SH +README dummy.SH Configure config_h.SH diff -P -u -r metaconfig/U.check/README metaconfig-andy/U.check/README --- metaconfig/U.check/README Wed Dec 31 19:00:00 1969 +++ metaconfig-andy/U.check/README Fri Sep 6 13:56:36 2002 @@ -0,0 +1,8 @@ +Since metaconfig units are modular, you don't have to regenerate perl5's entire +Configure every time you want to test just one unit. Instead, you can +run metaconfig against a smaller project that tests just one (or a few) +units. That's what this U.check directory is for. + +Just edit main.c and dummy.SH to use whatever metaconfig symbols you're +trying to test. Then run metaconfig -m to regenerate Configure. +You'll get a slimmed-down Configure that tests just what you want to test. diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/abortsig.U metaconfig-andy/dist-3.0at70b/mcon/U/abortsig.U --- metaconfig/dist-3.0at70b/mcon/U/abortsig.U Fri Sep 6 14:10:32 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/abortsig.U Fri Sep 6 13:53:19 2002 @@ -40,7 +40,7 @@ '') $cat >abort.c <<EOP #include <signal.h> caught() { exit(0); } -main() +int main() { #ifdef $signal signal($signal, caught); diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/alignbytes.U metaconfig-andy/dist-3.0at70b/mcon/U/alignbytes.U --- metaconfig/dist-3.0at70b/mcon/U/alignbytes.U Fri Sep 6 14:10:32 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/alignbytes.U Fri Sep 6 13:53:19 2002 @@ -42,7 +42,7 @@ char foo; double bar; } try; -main() +int main() { printf("%d\n", (char *)&try.bar - (char *)&try.foo); } diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/bitpbyte.U metaconfig-andy/dist-3.0at70b/mcon/U/bitpbyte.U --- metaconfig/dist-3.0at70b/mcon/U/bitpbyte.U Fri Sep 6 14:10:33 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/bitpbyte.U Fri Sep 6 13:53:19 2002 @@ -51,7 +51,7 @@ #define BITSPERBYTE 8 #endif #endif -main() +int main() { printf("%d\n", BITSPERBYTE); } diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/byteorder.U metaconfig-andy/dist-3.0at70b/mcon/U/byteorder.U --- metaconfig/dist-3.0at70b/mcon/U/byteorder.U Fri Sep 6 14:10:33 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/byteorder.U Fri Sep 6 13:53:19 2002 @@ -48,7 +48,7 @@ EOM $cat >try.c <<'EOCP' #include <stdio.h> -main() +int main() { int i; union { diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/ccflags.U metaconfig-andy/dist-3.0at70b/mcon/U/ccflags.U --- metaconfig/dist-3.0at70b/mcon/U/ccflags.U Fri Sep 6 14:10:33 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/ccflags.U Fri Sep 6 13:53:19 2002 @@ -354,7 +354,7 @@ EOM $cat > try.c <<'EOF' #include <stdio.h> -main() { exit(0); } +int main() { exit(0); } EOF dflt=y ?X: Use "sh -c" to avoid error messages tagged with leading "Configure:". diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/charorder.U metaconfig-andy/dist-3.0at70b/mcon/U/charorder.U --- metaconfig/dist-3.0at70b/mcon/U/charorder.U Fri Sep 6 14:10:34 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/charorder.U Fri Sep 6 13:53:19 2002 @@ -52,7 +52,7 @@ $cat >byteorder.c <<'EOCP' #include <stdio.h> -main(argc, argv) +int main(argc, argv) int argc; char *argv[]; { int i; diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/charsize.U metaconfig-andy/dist-3.0at70b/mcon/U/charsize.U --- metaconfig/dist-3.0at70b/mcon/U/charsize.U Fri Sep 6 14:10:34 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/charsize.U Fri Sep 6 13:53:19 2002 @@ -35,7 +35,7 @@ echo "Checking to see how big your characters are..." >&4 $cat >try.c <<'EOCP' #include <stdio.h> -main() +int main() { printf("%d\n", sizeof(char)); } diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_NOFILE.U metaconfig-andy/dist-3.0at70b/mcon/U/d_NOFILE.U --- metaconfig/dist-3.0at70b/mcon/U/d_NOFILE.U Fri Sep 6 14:10:35 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_NOFILE.U Fri Sep 6 13:53:19 2002 @@ -58,7 +58,7 @@ @if VAL_NOFILE || nofile $cat >nofile.c <<'EOCP' #include <stdio.h> -main() +int main() { printf("%d\n", getdtablesize()); } diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_PORTAR.U metaconfig-andy/dist-3.0at70b/mcon/U/d_PORTAR.U --- metaconfig/dist-3.0at70b/mcon/U/d_PORTAR.U Fri Sep 6 14:10:35 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_PORTAR.U Fri Sep 6 13:53:19 2002 @@ -37,7 +37,7 @@ echo 'Checking to see if we need to define PORTAR for portable archives...' >&4 $cat >portar.c <<'EOCP' #include <ar.h> -main() { +int main() { char *arfmag = ARFMAG; int sarmag = SARMAG; struct ar_hdr arh; diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_SHM_MAC.U metaconfig-andy/dist-3.0at70b/mcon/U/d_SHM_MAC.U --- metaconfig/dist-3.0at70b/mcon/U/d_SHM_MAC.U Fri Sep 6 14:10:35 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_SHM_MAC.U Fri Sep 6 13:53:19 2002 @@ -86,7 +86,7 @@ #include <sys/seg.h> #endif -main() { +int main() { int foo = SHMLBA ; } EOCP diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_access.U metaconfig-andy/dist-3.0at70b/mcon/U/d_access.U --- metaconfig/dist-3.0at70b/mcon/U/d_access.U Fri Sep 6 14:10:35 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_access.U Fri Sep 6 13:53:19 2002 @@ -47,7 +47,7 @@ #ifdef I_UNISTD #include <unistd.h> #endif -main() { +int main() { exit(R_OK); } EOCP diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_bsdjmp.U metaconfig-andy/dist-3.0at70b/mcon/U/d_bsdjmp.U --- metaconfig/dist-3.0at70b/mcon/U/d_bsdjmp.U Fri Sep 6 14:10:36 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_bsdjmp.U Fri Sep 6 13:53:19 2002 @@ -43,7 +43,7 @@ #include <setjmp.h> jmp_buf env; int set = 1; -main() +int main() { if (_setjmp(env)) exit(set); diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_casti32.U metaconfig-andy/dist-3.0at70b/mcon/U/d_casti32.U --- metaconfig/dist-3.0at70b/mcon/U/d_casti32.U Fri Sep 6 14:10:36 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_casti32.U Fri Sep 6 13:53:19 2002 @@ -49,7 +49,7 @@ #include <sys/types.h> #include <signal.h> $signal_t blech() { exit(3); } -main() +int main() { $xxx i32; double f; diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_castneg.U metaconfig-andy/dist-3.0at70b/mcon/U/d_castneg.U --- metaconfig/dist-3.0at70b/mcon/U/d_castneg.U Fri Sep 6 14:10:36 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_castneg.U Fri Sep 6 13:53:19 2002 @@ -64,7 +64,7 @@ unsigned long dummy_long(p) unsigned long p; { return p; } unsigned int dummy_int(p) unsigned int p; { return p; } unsigned short dummy_short(p) unsigned short p; { return p; } -main() +int main() { double f = -123.; unsigned long along; diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_charsprf.U metaconfig-andy/dist-3.0at70b/mcon/U/d_charsprf.U --- metaconfig/dist-3.0at70b/mcon/U/d_charsprf.U Fri Sep 6 14:10:36 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_charsprf.U Fri Sep 6 13:53:19 2002 @@ -31,7 +31,7 @@ : see if sprintf is declared as int or pointer to char echo " " $cat >ucbsprf.c <<'EOF' -main() +int main() { int sprintf(); char buf[10]; diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_ckeypad.U metaconfig-andy/dist-3.0at70b/mcon/U/d_ckeypad.U --- metaconfig/dist-3.0at70b/mcon/U/d_ckeypad.U Fri Sep 6 14:10:36 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_ckeypad.U Fri Sep 6 13:53:19 2002 @@ -36,7 +36,7 @@ echo "Checking the curses library ($termlib) for the keypad() function..." >&4 $cat >c_keypad.c <<'EOCP' #include <curses.h> -main() { +int main() { keypad(stdscr, TRUE); exit(0); } diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_const.U metaconfig-andy/dist-3.0at70b/mcon/U/d_const.U --- metaconfig/dist-3.0at70b/mcon/U/d_const.U Fri Sep 6 14:10:36 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_const.U Fri Sep 6 13:53:19 2002 @@ -46,7 +46,7 @@ ?X: handle typedefs properly if they're declared const. To guard ?X: against this, boost up the test by using an explicit typedef... typedef struct spug { int drokk; } spug; -main() +int main() { const char *foo; const spug y; diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_eofpipe.U metaconfig-andy/dist-3.0at70b/mcon/U/d_eofpipe.U --- metaconfig/dist-3.0at70b/mcon/U/d_eofpipe.U Fri Sep 6 14:10:37 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_eofpipe.U Fri Sep 6 13:53:19 2002 @@ -36,7 +36,7 @@ '') echo "Let's see if your pipes return EOF to select() upon closing..." >&4 $cat >pipe.c <<'EOP' -main() +int main() { int pd[2]; int mask; diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_fd_set.U metaconfig-andy/dist-3.0at70b/mcon/U/d_fd_set.U --- metaconfig/dist-3.0at70b/mcon/U/d_fd_set.U Fri Sep 6 14:10:37 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_fd_set.U Fri Sep 6 13:53:19 2002 @@ -82,7 +82,7 @@ #ifdef I_SYS_SELECT #include <sys/select.h> #endif -main() { +int main() { fd_set fds; #ifdef TRYBITS diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_getpagsz.U metaconfig-andy/dist-3.0at70b/mcon/U/d_getpagsz.U --- metaconfig/dist-3.0at70b/mcon/U/d_getpagsz.U Fri Sep 6 14:10:38 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_getpagsz.U Fri Sep 6 13:53:19 2002 @@ -54,7 +54,7 @@ '') $cat >page.c <<EOP extern int getpagesize(); -main() +int main() { printf("%d\n", getpagesize()); } diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_getpgrp.U metaconfig-andy/dist-3.0at70b/mcon/U/d_getpgrp.U --- metaconfig/dist-3.0at70b/mcon/U/d_getpgrp.U Fri Sep 6 14:10:38 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_getpgrp.U Fri Sep 6 13:53:19 2002 @@ -54,7 +54,7 @@ #ifdef I_UNISTD # include <unistd.h> #endif -main() +int main() { if (getuid() == 0) { printf("(I see you are running Configure as super-user...)\n"); diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_isascii.U metaconfig-andy/dist-3.0at70b/mcon/U/d_isascii.U --- metaconfig/dist-3.0at70b/mcon/U/d_isascii.U Fri Sep 6 14:10:41 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_isascii.U Fri Sep 6 13:53:19 2002 @@ -36,7 +36,7 @@ $cat >isascii.c <<'EOCP' #include <stdio.h> #include <ctype.h> -main() { +int main() { int c = 'A'; if (isascii(c)) exit(0); diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_keepsig.U metaconfig-andy/dist-3.0at70b/mcon/U/d_keepsig.U --- metaconfig/dist-3.0at70b/mcon/U/d_keepsig.U Fri Sep 6 14:10:41 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_keepsig.U Fri Sep 6 13:53:19 2002 @@ -45,7 +45,7 @@ $cat >try.c <<'EOCP' foo() {} -main() +int main() { signal(2, foo); kill(getpid(), 2); diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_nolnbuf.U metaconfig-andy/dist-3.0at70b/mcon/U/d_nolnbuf.U --- metaconfig/dist-3.0at70b/mcon/U/d_nolnbuf.U Fri Sep 6 14:10:48 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_nolnbuf.U Fri Sep 6 13:53:19 2002 @@ -36,7 +36,7 @@ '') $cat <<'EOT' >blurfl.c #include <stdio.h> -main() +int main() { int i; diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_open3.U metaconfig-andy/dist-3.0at70b/mcon/U/d_open3.U --- metaconfig/dist-3.0at70b/mcon/U/d_open3.U Fri Sep 6 14:10:48 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_open3.U Fri Sep 6 13:53:19 2002 @@ -48,7 +48,7 @@ #ifdef I_SYS_FILE #include <sys/file.h> #endif -main() { +int main() { if(O_RDONLY); #ifdef O_TRUNC exit(0); diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_pidcheck.U metaconfig-andy/dist-3.0at70b/mcon/U/d_pidcheck.U --- metaconfig/dist-3.0at70b/mcon/U/d_pidcheck.U Fri Sep 6 14:10:48 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_pidcheck.U Fri Sep 6 13:53:19 2002 @@ -42,7 +42,7 @@ *) echo "Checking to see if kill(pid, 0) works..." >&4 $cat >try.c <<'EOCP' -main() +int main() { int pid, status0, status9; diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_safebcpy.U metaconfig-andy/dist-3.0at70b/mcon/U/d_safebcpy.U --- metaconfig/dist-3.0at70b/mcon/U/d_safebcpy.U Fri Sep 6 14:10:49 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_safebcpy.U Fri Sep 6 13:53:20 2002 @@ -72,7 +72,7 @@ #ifdef I_UNISTD # include <unistd.h> /* Needed for NetBSD */ #endif -main() +int main() { char buf[128], abc[128]; char *b; diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_safemcpy.U metaconfig-andy/dist-3.0at70b/mcon/U/d_safemcpy.U --- metaconfig/dist-3.0at70b/mcon/U/d_safemcpy.U Fri Sep 6 14:10:49 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_safemcpy.U Fri Sep 6 13:53:20 2002 @@ -75,7 +75,7 @@ #ifdef I_UNISTD # include <unistd.h> /* Needed for NetBSD */ #endif -main() +int main() { char buf[128], abc[128]; char *b; diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_sanemcmp.U metaconfig-andy/dist-3.0at70b/mcon/U/d_sanemcmp.U --- metaconfig/dist-3.0at70b/mcon/U/d_sanemcmp.U Fri Sep 6 14:10:49 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_sanemcmp.U Fri Sep 6 13:53:20 2002 @@ -60,7 +60,7 @@ #ifdef I_UNISTD # include <unistd.h> /* Needed for NetBSD */ #endif -main() +int main() { char a = -1; char b = 0; diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_scannl.U metaconfig-andy/dist-3.0at70b/mcon/U/d_scannl.U --- metaconfig/dist-3.0at70b/mcon/U/d_scannl.U Fri Sep 6 14:10:49 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_scannl.U Fri Sep 6 13:53:20 2002 @@ -45,7 +45,7 @@ ?X: to the string given as argument to scanf(). echo 'Let'"'"'s see if scanf() handles "\\n" correctly...' >&4 $cat >try.c <<'EOCP' -main() +int main() { int i = 0, j = 0; scanf("%d\n%d", &i, &j); diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_setpgrp.U metaconfig-andy/dist-3.0at70b/mcon/U/d_setpgrp.U --- metaconfig/dist-3.0at70b/mcon/U/d_setpgrp.U Fri Sep 6 14:10:50 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_setpgrp.U Fri Sep 6 13:53:20 2002 @@ -65,7 +65,7 @@ #ifdef I_UNISTD # include <unistd.h> #endif -main() +int main() { if (getuid() == 0) { printf("(I see you are running Configure as super-user...)\n"); diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_sgndchr.U metaconfig-andy/dist-3.0at70b/mcon/U/d_sgndchr.U --- metaconfig/dist-3.0at70b/mcon/U/d_sgndchr.U Fri Sep 6 14:10:52 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_sgndchr.U Fri Sep 6 13:53:20 2002 @@ -37,7 +37,7 @@ echo " " echo "Checking to see if your C compiler can do signed chars..." >&4 $cat >try.c <<'EOCP' -main() +int main() { char c = 0; diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_sigaction.U metaconfig-andy/dist-3.0at70b/mcon/U/d_sigaction.U --- metaconfig/dist-3.0at70b/mcon/U/d_sigaction.U Fri Sep 6 14:10:53 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_sigaction.U Fri Sep 6 13:53:20 2002 @@ -45,7 +45,7 @@ #include <stdio.h> #include <sys/types.h> #include <signal.h> -main() +int main() { struct sigaction act, oact; } diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_sigsetjmp.U metaconfig-andy/dist-3.0at70b/mcon/U/d_sigsetjmp.U --- metaconfig/dist-3.0at70b/mcon/U/d_sigsetjmp.U Fri Sep 6 14:10:53 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_sigsetjmp.U Fri Sep 6 13:53:20 2002 @@ -67,7 +67,7 @@ #include <setjmp.h> sigjmp_buf env; int set = 1; -main() +int main() { if (sigsetjmp(env,1)) exit(set); diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_stdstdio.U metaconfig-andy/dist-3.0at70b/mcon/U/d_stdstdio.U --- metaconfig/dist-3.0at70b/mcon/U/d_stdstdio.U Fri Sep 6 14:10:54 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_stdstdio.U Fri Sep 6 13:53:20 2002 @@ -196,7 +196,7 @@ #include <stdio.h> #define FILE_ptr(fp) $stdio_ptr #define FILE_cnt(fp) $stdio_cnt -main() { +int main() { FILE *fp = fopen("try.c", "r"); char c = getc(fp); if ( diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_strctcpy.U metaconfig-andy/dist-3.0at70b/mcon/U/d_strctcpy.U --- metaconfig/dist-3.0at70b/mcon/U/d_strctcpy.U Fri Sep 6 14:10:55 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_strctcpy.U Fri Sep 6 13:53:20 2002 @@ -31,7 +31,7 @@ echo " " echo "Checking to see if your C compiler can copy structs..." >&4 $cat >try.c <<'EOCP' -main() +int main() { struct blurfl { int dyick; diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_volatile.U metaconfig-andy/dist-3.0at70b/mcon/U/d_volatile.U --- metaconfig/dist-3.0at70b/mcon/U/d_volatile.U Fri Sep 6 14:10:57 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_volatile.U Fri Sep 6 13:53:20 2002 @@ -41,7 +41,7 @@ echo " " echo 'Checking to see if your C compiler knows about "volatile"...' >&4 $cat >try.c <<'EOCP' -main() +int main() { ?X: ?X: The following seven lines added by Bill Campbell <[EMAIL PROTECTED]> diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_vprintf.U metaconfig-andy/dist-3.0at70b/mcon/U/d_vprintf.U --- metaconfig/dist-3.0at70b/mcon/U/d_vprintf.U Fri Sep 6 14:10:57 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_vprintf.U Fri Sep 6 13:53:20 2002 @@ -48,7 +48,7 @@ $cat >vprintf.c <<'EOF' #include <varargs.h> -main() { xxx("foo"); } +int main() { xxx("foo"); } xxx(va_alist) va_dcl diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/d_wifstat.U metaconfig-andy/dist-3.0at70b/mcon/U/d_wifstat.U --- metaconfig/dist-3.0at70b/mcon/U/d_wifstat.U Fri Sep 6 14:10:57 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/d_wifstat.U Fri Sep 6 13:53:20 2002 @@ -56,7 +56,7 @@ #include <sys/types.h> #include <sys/wait.h> -main() +int main() { $type status; int e = 0; diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/doublesize.U metaconfig-andy/dist-3.0at70b/mcon/U/doublesize.U --- metaconfig/dist-3.0at70b/mcon/U/doublesize.U Fri Sep 6 14:10:57 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/doublesize.U Fri Sep 6 13:53:20 2002 @@ -35,7 +35,7 @@ echo "Checking to see how big your double precision numbers are..." >&4 $cat >try.c <<'EOCP' #include <stdio.h> -main() +int main() { printf("%d\n", sizeof(double)); } diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/errnolist.U metaconfig-andy/dist-3.0at70b/mcon/U/errnolist.U --- metaconfig/dist-3.0at70b/mcon/U/errnolist.U Fri Sep 6 14:10:57 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/errnolist.U Fri Sep 6 13:53:20 2002 @@ -81,7 +81,7 @@ EOM $cat >errnolist.c <<'EOCP' extern char *sys_errnolist[]; -main() { +int main() { char *p0 = sys_errnolist[0]; char *p1 = sys_errnolist[1]; diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/floatsize.U metaconfig-andy/dist-3.0at70b/mcon/U/floatsize.U --- metaconfig/dist-3.0at70b/mcon/U/floatsize.U Fri Sep 6 14:10:57 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/floatsize.U Fri Sep 6 13:53:20 2002 @@ -35,7 +35,7 @@ echo "Checking to see how big your floating point numbers are..." >&4 $cat >try.c <<'EOCP' #include <stdio.h> -main() +int main() { printf("%d\n", sizeof(float)); } diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/i_db.U metaconfig-andy/dist-3.0at70b/mcon/U/i_db.U --- metaconfig/dist-3.0at70b/mcon/U/i_db.U Fri Sep 6 14:10:57 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/i_db.U Fri Sep 6 13:53:20 2002 @@ -79,7 +79,7 @@ { } HASHINFO info; -main() +int main() { info.hash = hash_cb; } diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/i_sysioctl.U metaconfig-andy/dist-3.0at70b/mcon/U/i_sysioctl.U --- metaconfig/dist-3.0at70b/mcon/U/i_sysioctl.U Fri Sep 6 14:10:59 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/i_sysioctl.U Fri Sep 6 13:53:20 2002 @@ -177,7 +177,7 @@ #include <sys/types.h> /* Just in case */ #include <$xxx> -main() +int main() { #ifdef TIOCNOTTY exit(0); diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/i_time.U metaconfig-andy/dist-3.0at70b/mcon/U/i_time.U --- metaconfig/dist-3.0at70b/mcon/U/i_time.U Fri Sep 6 14:11:01 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/i_time.U Fri Sep 6 13:53:20 2002 @@ -73,7 +73,7 @@ #ifdef I_SYSSELECT #include <sys/select.h> #endif -main() +int main() { struct tm foo; #ifdef S_TIMEVAL diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/install.U metaconfig-andy/dist-3.0at70b/mcon/U/install.U --- metaconfig/dist-3.0at70b/mcon/U/install.U Fri Sep 6 14:11:02 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/install.U Fri Sep 6 13:53:20 2002 @@ -53,7 +53,7 @@ done done $cat >try.c <<EOC -main() +int main() { printf("OK\n"); exit(0); diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/intsize.U metaconfig-andy/dist-3.0at70b/mcon/U/intsize.U --- metaconfig/dist-3.0at70b/mcon/U/intsize.U Fri Sep 6 14:11:02 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/intsize.U Fri Sep 6 13:53:20 2002 @@ -59,7 +59,7 @@ echo "Checking to see how big your integers are..." >&4 $cat >intsize.c <<'EOCP' #include <stdio.h> -main() +int main() { @if INTSIZE || intsize printf("intsize=%d;\n", sizeof(int)); diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/models.U metaconfig-andy/dist-3.0at70b/mcon/U/models.U --- metaconfig/dist-3.0at70b/mcon/U/models.U Fri Sep 6 14:11:09 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/models.U Fri Sep 6 13:53:20 2002 @@ -63,7 +63,7 @@ ?X: We may not use Cppsym or we get a circular dependency through cc. ?X: But this should work regardless of which cc we eventually use. $cat >pdp11.c <<'EOP' -main() { +int main() { #ifdef pdp11 exit(0); #else diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/nblock_io.U metaconfig-andy/dist-3.0at70b/mcon/U/nblock_io.U --- metaconfig/dist-3.0at70b/mcon/U/nblock_io.U Fri Sep 6 14:11:10 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/nblock_io.U Fri Sep 6 13:53:20 2002 @@ -91,7 +91,7 @@ '') $cat head.c > try.c $cat >>try.c <<'EOCP' -main() { +int main() { #ifdef O_NONBLOCK printf("O_NONBLOCK\n"); exit(0); diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/nlist_pfx.U metaconfig-andy/dist-3.0at70b/mcon/U/nlist_pfx.U --- metaconfig/dist-3.0at70b/mcon/U/nlist_pfx.U Fri Sep 6 14:11:10 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/nlist_pfx.U Fri Sep 6 13:53:20 2002 @@ -46,7 +46,7 @@ #include <stdio.h> #include <nlist.h> -main(argc, argv) +int main(argc, argv) int argc; char **argv; { diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/orderlib.U metaconfig-andy/dist-3.0at70b/mcon/U/orderlib.U --- metaconfig/dist-3.0at70b/mcon/U/orderlib.U Fri Sep 6 14:11:10 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/orderlib.U Fri Sep 6 13:53:20 2002 @@ -50,7 +50,7 @@ echo 'int bar1() { return bar2(); }' > bar1.c echo 'int bar2() { return 2; }' > bar2.c $cat > foo.c <<'EOP' -main() { printf("%d\n", bar1()); exit(0); } +int main() { printf("%d\n", bar1()); exit(0); } EOP $cc $ccflags -c bar1.c >/dev/null 2>&1 $cc $ccflags -c bar2.c >/dev/null 2>&1 diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/prototype.U metaconfig-andy/dist-3.0at70b/mcon/U/prototype.U --- metaconfig/dist-3.0at70b/mcon/U/prototype.U Fri Sep 6 14:11:12 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/prototype.U Fri Sep 6 13:53:20 2002 @@ -102,7 +102,7 @@ echo " " echo "Checking out function prototypes..." >&4 $cat >prototype.c <<'EOCP' -main(int argc, char *argv[]) { +int main(int argc, char *argv[]) { exit(0);} EOCP if $cc $ccflags -c prototype.c >prototype.out 2>&1 ; then diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/ptrsize.U metaconfig-andy/dist-3.0at70b/mcon/U/ptrsize.U --- metaconfig/dist-3.0at70b/mcon/U/ptrsize.U Fri Sep 6 14:11:12 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/ptrsize.U Fri Sep 6 13:53:20 2002 @@ -35,7 +35,7 @@ echo "Checking to see how big your pointers are..." >&4 $cat >try.c <<'EOCP' #include <stdio.h> -main() +int main() { printf("%d\n", sizeof(char *)); } diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/randbits.U metaconfig-andy/dist-3.0at70b/mcon/U/randbits.U --- metaconfig/dist-3.0at70b/mcon/U/randbits.U Fri Sep 6 14:11:12 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/randbits.U Fri Sep 6 13:53:20 2002 @@ -50,7 +50,7 @@ #endif EOCP $cat >>try.c <<'EOCP' -main() +int main() { register int i; register unsigned long tmp; diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/randfunc.U metaconfig-andy/dist-3.0at70b/mcon/U/randfunc.U --- metaconfig/dist-3.0at70b/mcon/U/randfunc.U Fri Sep 6 14:11:12 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/randfunc.U Fri Sep 6 13:53:20 2002 @@ -107,7 +107,7 @@ echo "Checking to see how many bits your $randfunc() function produces..." >&4 $cat >try.c <<EOCP #include <stdio.h> -main() +int main() { register int i; register unsigned long tmp; diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/sbrksmart.U metaconfig-andy/dist-3.0at70b/mcon/U/sbrksmart.U --- metaconfig/dist-3.0at70b/mcon/U/sbrksmart.U Fri Sep 6 14:11:12 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/sbrksmart.U Fri Sep 6 13:53:20 2002 @@ -39,7 +39,7 @@ $cat > sbrk.c <<'EOC' #define INC 256 /* Small enough to be less than a page size */ -main() +int main() { char *obrk = (char *) sbrk(0); char *nbrk; diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/selecttype.U metaconfig-andy/dist-3.0at70b/mcon/U/selecttype.U --- metaconfig/dist-3.0at70b/mcon/U/selecttype.U Fri Sep 6 14:11:13 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/selecttype.U Fri Sep 6 13:53:20 2002 @@ -78,7 +78,7 @@ #ifdef I_SYS_SELECT #include <sys/select.h> #endif -main() +int main() { int width; Select_fd_set_t readfds; diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/sockopt.U metaconfig-andy/dist-3.0at70b/mcon/U/sockopt.U --- metaconfig/dist-3.0at70b/mcon/U/sockopt.U Fri Sep 6 14:11:14 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/sockopt.U Fri Sep 6 13:53:20 2002 @@ -43,7 +43,7 @@ #include <netinet/in.h> #include <netdb.h> -main() +int main() { int s = socket(AF_INET, SOCK_STREAM, 0); if (s == -1) diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/ssizetype.U metaconfig-andy/dist-3.0at70b/mcon/U/ssizetype.U --- metaconfig/dist-3.0at70b/mcon/U/ssizetype.U Fri Sep 6 14:11:14 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/ssizetype.U Fri Sep 6 13:53:20 2002 @@ -51,7 +51,7 @@ #include <sys/types.h> #define Size_t $sizetype #define SSize_t $dflt -main() +int main() { if (sizeof(Size_t) == sizeof(SSize_t)) printf("$dflt\n"); diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/sunscanf.U metaconfig-andy/dist-3.0at70b/mcon/U/sunscanf.U --- metaconfig/dist-3.0at70b/mcon/U/sunscanf.U Fri Sep 6 14:11:14 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/sunscanf.U Fri Sep 6 13:53:20 2002 @@ -29,7 +29,7 @@ echo " " echo "Checking to see what flavor of scanf you have..." >&4 $cat >scanf.c <<'EOCP' -main() +int main() { float value; diff -P -u -r metaconfig/dist-3.0at70b/mcon/U/voidflags.U metaconfig-andy/dist-3.0at70b/mcon/U/voidflags.U --- metaconfig/dist-3.0at70b/mcon/U/voidflags.U Fri Sep 6 14:11:16 2002 +++ metaconfig-andy/dist-3.0at70b/mcon/U/voidflags.U Fri Sep 6 13:53:20 2002 @@ -95,7 +95,7 @@ #endif exit(0); } -main() { sub(); } +int main() { sub(); } EOCP ?X: This unit used to use cc -S in those tests to try to speed up things, but ?X: unfortunately, AIX 3.2 does not support this option. -- Andy Dougherty [EMAIL PROTECTED] Dept. of Physics Lafayette College, Easton PA 18042