metaconfig fixes from Andy.

p4raw-id: //depot/metaconfig@4466

diff --git a/U/Glossary.patch b/U/Glossary.patch
index be6d8e3..597ff92 100644 (file)
--- a/U/Glossary.patch
+++ b/U/Glossary.patch
@@ -8,9 +8,9 @@ Porting/Glossary.
 
     Andy Dougherty  July 9, 1998
 
 
     Andy Dougherty  July 9, 1998
 

---- Glossary.mc        Mon Apr 19 22:46:30 1999
-+++ Glossary   Mon Apr 19 22:46:49 1999
-@@ -2254,7 +2254,7 @@
+--- Glossary.mc        Tue Oct 26 16:41:48 1999
++++ Glossary   Tue Oct 26 16:41:48 1999
+@@ -2336,7 +2336,7 @@

        make_set_make='#'               # If your make program handles this for you,
        make_set_make="MAKE=$make"      # if it doesn't.
        I used a comment character so that we can distinguish a
        make_set_make='#'               # If your make program handles this for you,
        make_set_make="MAKE=$make"      # if it doesn't.
        I used a comment character so that we can distinguish a


@@ -19,7 +19,7 @@ Porting/Glossary.
        from an uncomputed value.
  
  mallocobj (mallocsrc.U):
        from an uncomputed value.
  
  mallocobj (mallocsrc.U):

-@@ -2369,7 +2369,7 @@
+@@ -2451,7 +2451,7 @@

        whole thing is then lower-cased.
  
  n (n.U):
        whole thing is then lower-cased.
  
  n (n.U):


@@ -28,7 +28,7 @@ Porting/Glossary.
        command to suppress newline.  Otherwise it is null.  Correct usage is
        $echo $n "prompt for a question: $c".
  
        command to suppress newline.  Otherwise it is null.  Correct usage is
        $echo $n "prompt for a question: $c".
  

-@@ -2634,9 +2634,9 @@
+@@ -2781,9 +2781,9 @@

        /bin/sh, though it's possible that some systems will have /bin/ksh,
        /bin/pdksh, /bin/ash, /bin/bash, or even something such as
        D:/bin/sh.exe.
        /bin/sh, though it's possible that some systems will have /bin/ksh,
        /bin/pdksh, /bin/ash, /bin/bash, or even something such as
        D:/bin/sh.exe.


@@ -40,7 +40,7 @@ Porting/Glossary.
  
  shar (Loc.U):
        This variable is defined but not used by Configure.
  
  shar (Loc.U):
        This variable is defined but not used by Configure.

-@@ -2766,7 +2766,7 @@
+@@ -2921,7 +2921,7 @@

  
  spitshell (spitshell.U):
        This variable contains the command necessary to spit out a runnable
  
  spitshell (spitshell.U):
        This variable contains the command necessary to spit out a runnable

diff --git a/U/mkglossary b/U/mkglossary
index dfd977b..f068a9a 100755 (executable)
--- a/U/mkglossary
+++ b/U/mkglossary
@@ -5,6 +5,8 @@ use File::Basename;
 # where you have installed dist-3.0PL70.
 @std_units = glob('/u/vieraat/vieraat/jhi/Perl/lib/dist/U/*.U');
 $PWD       =      '/u/vieraat/vieraat/jhi/pp4/cfgperl';
 # where you have installed dist-3.0PL70.
 @std_units = glob('/u/vieraat/vieraat/jhi/Perl/lib/dist/U/*.U');
 $PWD       =      '/u/vieraat/vieraat/jhi/pp4/cfgperl';

+# @std_units = glob('/opt/dist/lib/U/*.U');
+# $PWD       = '/export/home/doughera/src/perl/p4perl';

 
 chdir U if -d './U';
 @perl_units = glob("$PWD/U/*/*.U");
 
 chdir U if -d './U';
 @perl_units = glob("$PWD/U/*/*.U");


@@ -94,6 +96,58 @@ EOE
         }
        $gotit = 1;
     }
         }
        $gotit = 1;
     }

+    # Handle special variables from Oldsyms.U.  Since these start
+    # with capital letters, metalint considers them to be "special
+    # unit" symbols.  It's easier to define them here than to try
+    # to fool metalint any further.   --AD  22 Oct 1999
+    elsif ($var eq 'PERL_REVISION') {
+       $gotit = 1;
+       print <<'EOE';
+PERL_REVISION (Oldsyms.U):
+       In a Perl version number such as 5.6.2, this is the 5.
+       This value is manually set in patchlevel.h
+
+EOE
+    }
+    elsif ($var eq 'PERL_VERSION') {
+       $gotit = 1;
+       print <<'EOE';
+PERL_VERSION (Oldsyms.U):
+       In a Perl version number such as 5.6.2, this is the 6.
+       This value is manually set in patchlevel.h
+
+EOE
+    }
+    elsif ($var eq 'PERL_SUBVERSION') {
+       $gotit = 1;
+       print <<'EOE';
+PERL_SUBVERSION (Oldsyms.U):
+       In a Perl version number such as 5.6.2, this is the 2.
+       Values greater than 50 represent potentially unstable
+       development subversions.
+       This value is manually set in patchlevel.h
+
+EOE
+    }
+    elsif ($var eq 'PERL_APIVERSION') {
+       $gotit = 1;
+       print <<'EOE';
+PERL_APIVERSION (Oldsyms.U):
+       This value is manually set in patchlevel.h and is used
+       to set the Configure apiversion variable.
+
+EOE
+    }
+    elsif ($var eq 'CONFIGDOTSH') {
+       $gotit = 1;
+       print <<'EOE';
+CONFIGDOTSH (Oldsyms.U):
+       This is set to 'true' in config.sh so that a shell script
+       sourcing config.sh can tell if it has been sourced already.
+
+EOE
+    }
+

     warn "$0: couldn't find $var\n"
     warn "$0: couldn't find $var\n"

-        if not $gotit and $var !~ /^(Author|Date|Header|Id|Locker|Log|Mcc|RCSfile|Revision|Source|State)$|_cflags$|^config_arg|^PERL_(REVISION|VERSION|SUBVERSION)$/;
+        if not $gotit and $var !~ /^(Author|Date|Header|Id|Locker|Log|Mcc|RCSfile|Revision|Source|State)$|_cflags$|^config_arg/;

 }
 }

diff --git a/U/modified/libnlist.U b/U/modified/libnlist.U
new file mode 100644 (file)
index 0000000..5b7894d
--- /dev/null
+++ b/U/modified/libnlist.U
@@ -0,0 +1,49 @@
+?RCS: $Id: libnlist.U,v 3.0.1.1 1997/02/28 16:08:02 ram Exp $
+?RCS:
+?RCS: Copyright (c) 1991-1993, Raphael Manfredi
+?RCS: 
+?RCS: You may redistribute only under the terms of the Artistic Licence,
+?RCS: as specified in the README file that comes with the distribution.
+?RCS: You may reuse parts of this distribution only within the terms of
+?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:
+?RCS: $Log: libnlist.U,v $
+?RCS: Revision 3.0.1.1  1997/02/28  16:08:02  ram
+?RCS: patch61: added usrinc and mips on the dependency line
+?RCS: patch61: make sure we call ./mips
+?RCS: patch61: added a ?LINT: hint
+?RCS:
+?RCS: Revision 3.0  1993/08/18  12:09:00  ram
+?RCS: Baseline for dist 3.0 netwide release.
+?RCS:
+?MAKE:libnlist: Loc libpth Guess usrinc _a
+?MAKE: -pick add $@ %<
+?S:libnlist (libmld):
+?S:    This variable contains the name of the library required to get the
+?S:    definition of the nlist() function.  On a MIPS RISC/OS box, it is -lmld.
+?S:    Under Sys Vr4, it is -lelf.  Otherwise, its value is empty.
+?S:.
+?T:xxx
+?LINT:use usrinc
+: see if we need a special library for 'nlist()'
+echo " "
+: How about doing this if nlist is not in libc...
+if ./mips ; then
+       libnlist='-lmld'
+else
+       xxx=`./loc libelf$_a x $libpth`
+       case "$xxx" in
+       x)  ;;
+       *)
+               libnlist="$xxx"
+               ;;
+       esac
+fi
+case "$libnlist" in
+'') echo "No special library for nlist() seems necessary." >&4
+       ;;
+*)  echo "nlist() can be found in $libnlist." >&4
+       ;;
+esac
+

diff --git a/U/modified/libpth.U b/U/modified/libpth.U
index 76b6f75..59bdfea 100644 (file)
--- a/U/modified/libpth.U
+++ b/U/modified/libpth.U
@@ -35,7 +35,7 @@
 ?X:    This unit initializes the path for C library lookup.
 ?X:
 ?MAKE:libpth glibpth xlibpth plibpth loclibpth: \
 ?X:    This unit initializes the path for C library lookup.
 ?X:
 ?MAKE:libpth glibpth xlibpth plibpth loclibpth: \

-       usrinc mips incpath test cat Myread Oldconfig
+       usrinc incpath test cat Myread Oldconfig

 ?MAKE: -pick add $@ %<
 ?S:libpth:
 ?S:    This variable holds the general path (space-separated) used to find
 ?MAKE: -pick add $@ %<
 ?S:libpth:
 ?S:    This variable holds the general path (space-separated) used to find


@@ -85,8 +85,6 @@
 ?INIT:plibpth=''
 ?INIT:
 ?LINT:describe xlibpth glibpth
 ?INIT:plibpth=''
 ?INIT:
 ?LINT:describe xlibpth glibpth

-?LINT:extern mips
-?LINT:use mips usrinc

 : Set private lib path
 case "$plibpth" in
 '') if ./mips; then
 : Set private lib path
 case "$plibpth" in
 '') if ./mips; then

diff --git a/U/modified/usrinc.U b/U/modified/usrinc.U
new file mode 100644 (file)
index 0000000..c10db91
--- /dev/null
+++ b/U/modified/usrinc.U
@@ -0,0 +1,95 @@
+?RCS: $Id: usrinc.U,v 3.0.1.3 1997/02/28 16:27:12 ram Exp $
+?RCS:
+?RCS: Copyright (c) 1991-1993, Raphael Manfredi
+?RCS: 
+?RCS: You may redistribute only under the terms of the Artistic Licence,
+?RCS: as specified in the README file that comes with the distribution.
+?RCS: You may reuse parts of this distribution only within the terms of
+?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:
+?RCS: $Log: usrinc.U,v $
+?RCS: Revision 3.0.1.3  1997/02/28  16:27:12  ram
+?RCS: patch61: don't ask for the include path unless they are on a MIPS
+?RCS:
+?RCS: Revision 3.0.1.2  1995/05/12  12:24:36  ram
+?RCS: patch54: ensure that ./mips always exists (ADO)
+?RCS:
+?RCS: Revision 3.0.1.1  1994/05/06  15:18:31  ram
+?RCS: patch23: ensure usrinc value is preserved accross sessions (WED)
+?RCS:
+?RCS: Revision 3.0  1993/08/18  12:09:58  ram
+?RCS: Baseline for dist 3.0 netwide release.
+?RCS:
+?MAKE:usrinc incpath mips_type: test cat echo n c +cc Getfile Guess \
+       Oldconfig eunicefix contains rm
+?MAKE: -pick add $@ %<
+?S:usrinc:
+?S:    This variable holds the path of the include files, which is
+?S:    usually /usr/include. It is mainly used by other Configure units.
+?S:.
+?S:incpath:
+?S:    This variable must preceed the normal include path to get hte
+?S:    right one, as in "$incpath/usr/include" or "$incpath/usr/lib".
+?S:    Value can be "" or "/bsd43" on mips.
+?S:.
+?S:mips_type:
+?S:    This variable holds the environment type for the mips system.
+?S:    Possible values are "BSD 4.3" and "System V".
+?S:.
+?D:usrinc='/usr/include'
+?LINT:describe mips
+?LINT:set mips
+?LINT:create mips
+?T:xxx_prompt
+?F:./mips
+: What should the include directory be ?
+echo " "
+$echo $n "Hmm...  $c"
+dflt='/usr/include'
+incpath=''
+?X:    mips_type is used later, to add -DSYSTYPE_BSD43 to cppflags if needed.
+mips_type=''
+?X:
+?X:    Cannot put the following in Guess, or we get a circular dependency.
+?X:
+if $test -f /bin/mips && /bin/mips; then
+       echo "Looks like a MIPS system..."
+       $cat >usr.c <<'EOCP'
+#ifdef SYSTYPE_BSD43
+/bsd43
+#endif
+EOCP
+       if $cc -E usr.c > usr.out && $contains / usr.out >/dev/null 2>&1; then
+               dflt='/bsd43/usr/include'
+               incpath='/bsd43'
+               mips_type='BSD 4.3'
+       else
+               mips_type='System V'
+       fi
+       $rm -f usr.c usr.out
+       echo "and you're compiling with the $mips_type compiler and libraries."
+       xxx_prompt=y
+       echo "exit 0" >mips
+else
+       echo "Doesn't look like a MIPS system."
+       xxx_prompt=n
+       echo "exit 1" >mips
+fi
+chmod +x mips
+$eunicefix mips
+case "$usrinc" in
+'') ;;
+*) dflt="$usrinc";;
+esac
+case "$xxx_prompt" in
+y)     fn=d/
+       echo " "
+       rp='Where are the include files you want to use?'
+       . ./getfile
+       usrinc="$ans"
+       ;;
+*)     usrinc="$dflt"
+       ;;
+esac
+