Backport 17925 and 17926

enable -ansi -pedantic; Jarkko Hietaniemi <jhi@iki.fi>; Wed, 18 Sep 2002
defuse installusrbinperl; Jarkko Hietaniemi <jhi@iki.fi>; Thu, 19 Sep 2002

p4raw-id: //depot/metaconfig@17929

diff --git a/U/installdirs/instubperl.U b/U/installdirs/instubperl.U
index 2412cb1..aac064e 100644 (file)
--- a/U/installdirs/instubperl.U
+++ b/U/installdirs/instubperl.U
@@ -8,7 +8,7 @@
 ?RCS: that same Artistic Licence; a copy of which may be found at the root
 ?RCS: of the source tree for dist 3.0.
 ?RCS:
-?MAKE:installusrbinperl: installbin cat Myread Setvar test Devel
+?MAKE:installusrbinperl: installbin cat bin Myread Setvar test Devel
 ?MAKE: -pick add $@ %<
 ?LINT:set installusrbinperl
 ?Y:TOP
@@ -29,13 +29,33 @@ echo " "
 if $test -d /usr/bin -a "X$installbin" != X/usr/bin; then
        $cat <<EOM
 Many scripts expect perl to be installed as /usr/bin/perl.
-I can install the perl you are about to compile also as /usr/bin/perl
-(in addition to $installbin/perl).
+
+If you want to, I can install the perl you are about to compile
+as /usr/bin/perl (in addition to $bin/perl).
 EOM
-       case "$installusrbinperl" in
-       "$undef"|[nN]*) dflt='n';;
-       *)              dflt='y';;
-       esac
+       if test -f /usr/bin/perl; then
+           $cat <<EOM
+
+However, please note that because you already have a /usr/bin/perl,
+overwriting that with a new Perl would very probably cause problems.
+Therefore I'm assuming you don't want to do that (unless you insist).
+
+EOM
+           case "$installusrbinperl" in
+           "$define"|[yY]*)    dflt='y';;
+           *)                  dflt='n';;
+           esac
+       else
+           $cat <<EOM
+
+Since you don't have a /usr/bin/perl I'm assuming creating one is okay.
+
+EOM
+           case "$installusrbinperl" in
+           "$undef"|[nN]*)     dflt='n';;
+           *)                  dflt='y';;
+           esac
+       fi
        rp="Do you want to install perl as /usr/bin/perl?"
        . ./myread
        case "$ans" in

diff --git a/U/perl/gccvers.U b/U/perl/gccvers.U
index fdd7e97..8c44e2e 100644 (file)
--- a/U/perl/gccvers.U
+++ b/U/perl/gccvers.U
@@ -8,7 +8,7 @@
 ?RCS: that same Artistic Licence; a copy of which may be found at the root
 ?RCS: of the source tree for dist 3.0.
 ?RCS:
-?MAKE:gccversion gccosandvers: cat cpp rm +cc \
+?MAKE:gccversion gccosandvers gccansipedantic: cat cpp rm +cc \
        Mcc Myread Guess Options Oldconfig Loc osname osvers run
 ?MAKE: -pick add $@ %<
 ?S:gccversion:
@@ -17,14 +17,20 @@
 ?S:    setting some of the default cflags.  It is set to '' if not gcc.
 ?S:.
 ?S:gccosandvers:
-?S:    If GNU cc (gcc) is used, this variable the operating system and
-?S:    version used to compile the gcc.  It is set to '' if not gcc,
+?S:    If GNU cc (gcc) is used, this variable holds the operating system
+?S:    and version used to compile gcc.  It is set to '' if not gcc,
 ?S:    or if nothing useful can be parsed as the os version.
 ?S:.
+?S:gccansipedantic:
+?S:    If GNU cc (gcc) is used, this variable will enable (if set) the
+?S:    -ansi and -pedantic ccflags for building core files (through
+?S:    cflags script). (See Porting/pumpkin.pod for full description).
+?S:.
 ?T:gccshortvers
 ?T:incdir
 ?T:warn
 ?D:gccversion=''
+?D:gccansipedantic=''
 ?LINT:change cpp
 ?LINT:extern ccflags
 ?LINT:extern ldflags