diff options
author | Manish Vachharajani <mvachhar@src.gnome.org> | 1998-11-29 16:48:21 +0000 |
---|---|---|
committer | Manish Vachharajani <mvachhar@src.gnome.org> | 1998-11-29 16:48:21 +0000 |
commit | b03b92dcc0ee85c1b1b9f4c3f677010b8b23169a (patch) | |
tree | caae6afcd060569db2bb7598a6f733eb0d848a26 | |
parent | 590474bbe7f96f8880e78b92b87cbe8826775bab (diff) | |
download | gnome-desktop-b03b92dcc0ee85c1b1b9f4c3f677010b8b23169a.tar.gz |
Remove some deprecated functions from gnome-dialog
-rwxr-xr-x | config.guess | 13 | ||||
-rwxr-xr-x | config.sub | 38 | ||||
-rw-r--r-- | desktop-docs/gnome-intro/c93.html | 2 | ||||
-rw-r--r-- | desktop-docs/gnome-intro/c93230.html | 28 |
4 files changed, 51 insertions, 30 deletions
diff --git a/config.guess b/config.guess index 413ed41c..30230b3d 100755 --- a/config.guess +++ b/config.guess @@ -1,6 +1,6 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc. +# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -478,10 +478,10 @@ EOF echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` exit 0 ;; i*:CYGWIN*:*) - echo i386-pc-cygwin32 + echo ${UNAME_MACHINE}-pc-cygwin32 exit 0 ;; i*:MINGW*:*) - echo i386-pc-mingw32 + echo ${UNAME_MACHINE}-pc-mingw32 exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin32 @@ -493,6 +493,12 @@ EOF echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; *:Linux:*:*) + # uname on the ARM produces all sorts of strangeness, and we need to + # filter it out. + case "$UNAME_MACHINE" in + arm* | sa110*) UNAME_MACHINE="arm" ;; + esac + # The BFD linker knows what the default object file format is, so # first see if it will tell us. ld_help_string=`ld --help 2>&1` @@ -506,6 +512,7 @@ EOF i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;; i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;; sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; + armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; elf32ppc) echo "powerpc-unknown-linux-gnu" ; exit 0 ;; esac @@ -1,6 +1,6 @@ #! /bin/sh # Configuration validation subroutine script, version 1.1. -# Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc. +# Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc. # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software # can handle that machine. It does not imply ALL GNU software can. @@ -162,7 +162,7 @@ case $basic_machine in # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. - i[3456]86) + i[34567]86) basic_machine=$basic_machine-pc ;; # Object if more than one company name word. @@ -171,7 +171,7 @@ case $basic_machine in exit 1 ;; # Recognize the basic CPU types with company name. - vax-* | tahoe-* | i[3456]86-* | i860-* | m32r-* | m68k-* | m68000-* \ + vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \ | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \ @@ -350,19 +350,19 @@ case $basic_machine in os=-mvs ;; # I'm not sure what "Sysv32" means. Should this be sysv3.2? - i[3456]86v32) + i[34567]86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 ;; - i[3456]86v4*) + i[34567]86v4*) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv4 ;; - i[3456]86v) + i[34567]86v) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv ;; - i[3456]86sol2) + i[34567]86sol2) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; @@ -469,25 +469,23 @@ case $basic_machine in pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5) - basic_machine=i586-intel + pentium | p5 | k5 | nexen) + basic_machine=i586-pc ;; - pentiumpro | p6) - basic_machine=i686-intel + pentiumpro | p6 | k6 | 6x86) + basic_machine=i686-pc ;; - pentium-* | p5-*) + pentiumii | pentium2) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | nexen-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumpro-* | p6-*) + pentiumpro-* | p6-* | k6-* | 6x86-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - k5) - # We don't have specific support for AMD's K5 yet, so just call it a Pentium - basic_machine=i586-amd - ;; - nexen) - # We don't have specific support for Nexgen yet, so just call it a Pentium - basic_machine=i586-nexgen + pentiumii-* | pentium2-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould diff --git a/desktop-docs/gnome-intro/c93.html b/desktop-docs/gnome-intro/c93.html index 5fd9dafb..e6ee085e 100644 --- a/desktop-docs/gnome-intro/c93.html +++ b/desktop-docs/gnome-intro/c93.html @@ -129,7 +129,7 @@ CLASS="COMMAND" >. </P ><P -> You can invoke the help browser from the penel or from the +> You can invoke the help browser from the panel or from the shell by typing </P ><P diff --git a/desktop-docs/gnome-intro/c93230.html b/desktop-docs/gnome-intro/c93230.html index bfeb487e..23e6bd30 100644 --- a/desktop-docs/gnome-intro/c93230.html +++ b/desktop-docs/gnome-intro/c93230.html @@ -123,7 +123,7 @@ NAME="AEN248" raising the gain on others, just like the mixer console in a live music PA system.</P ><P -> You can invoke the GNOME mixer from the panl or by typing +> You can invoke the GNOME mixer from the panel or by typing <P CLASS="LITERALLAYOUT" ><TT @@ -222,11 +222,16 @@ CLASS="COMMAND" (<A HREF="c93230.html#GTCD" >Figure 2-15</A ->) shows me playing the Counting Crows, -the song <I +>) shows me blasting the Pixies + <A +NAME="AEN278" +HREF="#FTN.AEN278" +>[1]</A +> song <I CLASS="CITETITLE" ->Time And Time Again</I ->. +>Here Comes Your Man</I +> + in my headphones as I write these words. <DIV CLASS="FIGURE" ><P @@ -241,7 +246,18 @@ NAME="GTCD" SRC="pix/gtcd.gif"></P ></DIV > -<P + </P +><BLOCKQUOTE +DIV="FOOTNOTES" +><P +><A +NAME="FTN.AEN278" +HREF="c93230.html#AEN278" +>[1]</A +> The Pixies are an excellent punk group. I seldom + listen to punk rock, but I enjoy them.</P +></BLOCKQUOTE +><P > The GNOME CD player also allows you to dowload information from the impressive <I CLASS="FIRSTTERM" |