Commit debian/2.7.99-2 - guile-gnome-platform

Import Debian changes 2.7.99-2 guile-gnome-platform (2.7.99-2) unstable; urgency=low * Pull in upstream changes as 01_dev-upstream-20050410.patch, containing build fixes (closes: #303624). - Use simple-patchsys from CDBS. - Build-Depend on g-wrap >= 1.9.5-2 since upstream changes depend on that. * Auto-generate control from control.in (currently disabled due to #301692). Andreas Rottmann authored 19 years ago Tommi Höynälänmaa committed 5 years ago

9 changed file(s) with 4433 addition(s) and 12 deletion(s). Raw diff Collapse all Expand all

+13

-5

config.guess less more

0	0	#! /bin/sh
1	1	# Attempt to guess a canonical system name.
2	2	# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
3		# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
4
5		timestamp='2004-11-12'
	3	# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
	4
	5	timestamp='2005-03-24'
6	6
7	7	# This file is free software; you can redistribute it and/or modify it
8	8	# under the terms of the GNU General Public License as published by

52	52	GNU config.guess ($timestamp)
53	53
54	54	Originally written by Per Bothner.
55		Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
	55	Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
56	56	Free Software Foundation, Inc.
57	57
58	58	This is free software; see the source for copying conditions. There is NO

802	802	exit 0 ;;
803	803	i:UWIN:*)
804	804	echo ${UNAME_MACHINE}-pc-uwin
	805	exit 0 ;;
	806	amd64:CYGWIN::*)
	807	echo x86_64-unknown-cygwin
805	808	exit 0 ;;
806	809	p:CYGWIN:*)
807	810	echo powerpcle-unknown-cygwin

1196	1199	:QNX::4*)
1197	1200	echo i386-pc-qnx
1198	1201	exit 0 ;;
	1202	NSE-?:NONSTOP_KERNEL::)
	1203	echo nse-tandem-nsk${UNAME_RELEASE}
	1204	exit 0 ;;
1199	1205	NSR-?:NONSTOP_KERNEL::)
1200	1206	echo nsr-tandem-nsk${UNAME_RELEASE}
1201	1207	exit 0 ;;

1412	1418	the operating system you are using. It is advised that you
1413	1419	download the most up to date version of the config scripts from
1414	1420
1415		ftp://ftp.gnu.org/pub/gnu/config/
	1421	http://savannah.gnu.org/cgi-bin/viewcvs/checkout/config/config/config.guess
	1422	and
	1423	http://savannah.gnu.org/cgi-bin/viewcvs/checkout/config/config/config.sub
1416	1424
1417	1425	If the version you run ($0) is already up to date, please
1418	1426	send the following data and any information you think might be

+1453

-0

config.guess.cdbs-orig less more

	0	#! /bin/sh
	1	# Attempt to guess a canonical system name.
	2	# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
	3	# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
	4
	5	timestamp='2004-11-12'
	6
	7	# This file is free software; you can redistribute it and/or modify it
	8	# under the terms of the GNU General Public License as published by
	9	# the Free Software Foundation; either version 2 of the License, or
	10	# (at your option) any later version.
	11	#
	12	# This program is distributed in the hope that it will be useful, but
	13	# WITHOUT ANY WARRANTY; without even the implied warranty of
	14	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	15	# General Public License for more details.
	16	#
	17	# You should have received a copy of the GNU General Public License
	18	# along with this program; if not, write to the Free Software
	19	# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
	20	#
	21	# As a special exception to the GNU General Public License, if you
	22	# distribute this file as part of a program that contains a
	23	# configuration script generated by Autoconf, you may include it under
	24	# the same distribution terms that you use for the rest of that program.
	25
	26	# Originally written by Per Bothner <per@bothner.com>.
	27	# Please send patches to <config-patches@gnu.org>. Submit a context
	28	# diff and a properly formatted ChangeLog entry.
	29	#
	30	# This script attempts to guess a canonical system name similar to
	31	# config.sub. If it succeeds, it prints the system name on stdout, and
	32	# exits with 0. Otherwise, it exits with 1.
	33	#
	34	# The plan is that this can be called by configure scripts if you
	35	# don't specify an explicit build system type.
	36
	37	me=`echo "$0" \| sed -e 's,.*/,,'`
	38
	39	usage="\
	40	Usage: $0 [OPTION]
	41
	42	Output the configuration name of the system \`$me' is run on.
	43
	44	Operation modes:
	45	-h, --help print this help, then exit
	46	-t, --time-stamp print date of last modification, then exit
	47	-v, --version print version number, then exit
	48
	49	Report bugs and patches to <config-patches@gnu.org>."
	50
	51	version="\
	52	GNU config.guess ($timestamp)
	53
	54	Originally written by Per Bothner.
	55	Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
	56	Free Software Foundation, Inc.
	57
	58	This is free software; see the source for copying conditions. There is NO
	59	warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
	60
	61	help="
	62	Try \`$me --help' for more information."
	63
	64	# Parse command line
	65	while test $# -gt 0 ; do
	66	case $1 in
	67	--time-stamp \| --time* \| -t )
	68	echo "$timestamp" ; exit 0 ;;
	69	--version \| -v )
	70	echo "$version" ; exit 0 ;;
	71	--help \| --h* \| -h )
	72	echo "$usage"; exit 0 ;;
	73	-- ) # Stop option processing
	74	shift; break ;;
	75	- ) # Use stdin as input.
	76	break ;;
	77	-* )
	78	echo "$me: invalid option $1$help" >&2
	79	exit 1 ;;
	80	* )
	81	break ;;
	82	esac
	83	done
	84
	85	if test $# != 0; then
	86	echo "$me: too many arguments$help" >&2
	87	exit 1
	88	fi
	89
	90	trap 'exit 1' 1 2 15
	91
	92	# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
	93	# compiler to aid in system detection is discouraged as it requires
	94	# temporary files to be created and, as you can see below, it is a
	95	# headache to deal with in a portable fashion.
	96
	97	# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
	98	# use `HOST_CC' if defined, but it is deprecated.
	99
	100	# Portable tmp directory creation inspired by the Autoconf team.
	101
	102	set_cc_for_build='
	103	trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
	104	trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
	105	: ${TMPDIR=/tmp} ;
	106	{ tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } \|\|
	107	{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } \|\|
	108	{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } \|\|
	109	{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
	110	dummy=$tmp/dummy ;
	111	tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
	112	case $CC_FOR_BUILD,$HOST_CC,$CC in
	113	,,) echo "int x;" > $dummy.c ;
	114	for c in cc gcc c89 c99 ; do
	115	if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
	116	CC_FOR_BUILD="$c"; break ;
	117	fi ;
	118	done ;
	119	if test x"$CC_FOR_BUILD" = x ; then
	120	CC_FOR_BUILD=no_compiler_found ;
	121	fi
	122	;;
	123	,,*) CC_FOR_BUILD=$CC ;;
	124	,,) CC_FOR_BUILD=$HOST_CC ;;
	125	esac ;'
	126
	127	# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
	128	# (ghazi@noc.rutgers.edu 1994-08-24)
	129	if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
	130	PATH=$PATH:/.attbin ; export PATH
	131	fi
	132
	133	UNAME_MACHINE=`(uname -m) 2>/dev/null` \|\| UNAME_MACHINE=unknown
	134	UNAME_RELEASE=`(uname -r) 2>/dev/null` \|\| UNAME_RELEASE=unknown
	135	UNAME_SYSTEM=`(uname -s) 2>/dev/null` \|\| UNAME_SYSTEM=unknown
	136	UNAME_VERSION=`(uname -v) 2>/dev/null` \|\| UNAME_VERSION=unknown
	137
	138	# Note: order is significant - the case branches are not exclusive.
	139
	140	case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
	141	:NetBSD::*)
	142	# NetBSD (nbsd) targets should (where applicable) match one or
	143	# more of the tupples: --netbsdelf, --netbsdaout,
	144	# --netbsdecoff* and --netbsd*. For targets that recently
	145	# switched to ELF, --netbsd* would select the old
	146	# object file format. This provides both forward
	147	# compatibility and a consistent mechanism for selecting the
	148	# object file format.
	149	#
	150	# Note: NetBSD doesn't particularly care about the vendor
	151	# portion of the name. We always set it to "unknown".
	152	sysctl="sysctl -n hw.machine_arch"
	153	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null \|\| \
	154	/usr/sbin/$sysctl 2>/dev/null \|\| echo unknown)`
	155	case "${UNAME_MACHINE_ARCH}" in
	156	armeb) machine=armeb-unknown ;;
	157	arm*) machine=arm-unknown ;;
	158	sh3el) machine=shl-unknown ;;
	159	sh3eb) machine=sh-unknown ;;
	160	*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
	161	esac
	162	# The Operating System including object format, if it has switched
	163	# to ELF recently, or will in the future.
	164	case "${UNAME_MACHINE_ARCH}" in
	165	arm\|i386\|m68k\|ns32k\|sh3\|sparc\|vax)
	166	eval $set_cc_for_build
	167	if echo __ELF__ \| $CC_FOR_BUILD -E - 2>/dev/null \
	168	\| grep __ELF__ >/dev/null
	169	then
	170	# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
	171	# Return netbsd for either. FIX?
	172	os=netbsd
	173	else
	174	os=netbsdelf
	175	fi
	176	;;
	177	*)
	178	os=netbsd
	179	;;
	180	esac
	181	# The OS release
	182	# Debian GNU/NetBSD machines have a different userland, and
	183	# thus, need a distinct triplet. However, they do not need
	184	# kernel version information, so it can be replaced with a
	185	# suitable tag, in the style of linux-gnu.
	186	case "${UNAME_VERSION}" in
	187	Debian*)
	188	release='-gnu'
	189	;;
	190	*)
	191	release=`echo ${UNAME_RELEASE}\|sed -e 's/[-_].*/\./'`
	192	;;
	193	esac
	194	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
	195	# contains redundant information, the shorter form:
	196	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
	197	echo "${machine}-${os}${release}"
	198	exit 0 ;;
	199	amd64:OpenBSD::)
	200	echo x86_64-unknown-openbsd${UNAME_RELEASE}
	201	exit 0 ;;
	202	amiga:OpenBSD::)
	203	echo m68k-unknown-openbsd${UNAME_RELEASE}
	204	exit 0 ;;
	205	cats:OpenBSD::)
	206	echo arm-unknown-openbsd${UNAME_RELEASE}
	207	exit 0 ;;
	208	hp300:OpenBSD::)
	209	echo m68k-unknown-openbsd${UNAME_RELEASE}
	210	exit 0 ;;
	211	luna88k:OpenBSD::)
	212	echo m88k-unknown-openbsd${UNAME_RELEASE}
	213	exit 0 ;;
	214	mac68k:OpenBSD::)
	215	echo m68k-unknown-openbsd${UNAME_RELEASE}
	216	exit 0 ;;
	217	macppc:OpenBSD::)
	218	echo powerpc-unknown-openbsd${UNAME_RELEASE}
	219	exit 0 ;;
	220	mvme68k:OpenBSD::)
	221	echo m68k-unknown-openbsd${UNAME_RELEASE}
	222	exit 0 ;;
	223	mvme88k:OpenBSD::)
	224	echo m88k-unknown-openbsd${UNAME_RELEASE}
	225	exit 0 ;;
	226	mvmeppc:OpenBSD::)
	227	echo powerpc-unknown-openbsd${UNAME_RELEASE}
	228	exit 0 ;;
	229	sgi:OpenBSD::)
	230	echo mips64-unknown-openbsd${UNAME_RELEASE}
	231	exit 0 ;;
	232	sun3:OpenBSD::)
	233	echo m68k-unknown-openbsd${UNAME_RELEASE}
	234	exit 0 ;;
	235	:OpenBSD::*)
	236	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
	237	exit 0 ;;
	238	:ekkoBSD::*)
	239	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
	240	exit 0 ;;
	241	macppc:MirBSD::)
	242	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
	243	exit 0 ;;
	244	:MirBSD::*)
	245	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
	246	exit 0 ;;
	247	alpha:OSF1::)
	248	case $UNAME_RELEASE in
	249	*4.0)
	250	UNAME_RELEASE=`/usr/sbin/sizer -v \| awk '{print $3}'`
	251	;;
	252	5.)
	253	UNAME_RELEASE=`/usr/sbin/sizer -v \| awk '{print $4}'`
	254	;;
	255	esac
	256	# According to Compaq, /usr/sbin/psrinfo has been available on
	257	# OSF/1 and Tru64 systems produced since 1995. I hope that
	258	# covers most systems running today. This code pipes the CPU
	259	# types through head -n 1, so we only detect the type of CPU 0.
	260	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v \| sed -n -e 's/^ The alpha $.$ processor.$/\1/p' \| head -n 1`
	261	case "$ALPHA_CPU_TYPE" in
	262	"EV4 (21064)")
	263	UNAME_MACHINE="alpha" ;;
	264	"EV4.5 (21064)")
	265	UNAME_MACHINE="alpha" ;;
	266	"LCA4 (21066/21068)")
	267	UNAME_MACHINE="alpha" ;;
	268	"EV5 (21164)")
	269	UNAME_MACHINE="alphaev5" ;;
	270	"EV5.6 (21164A)")
	271	UNAME_MACHINE="alphaev56" ;;
	272	"EV5.6 (21164PC)")
	273	UNAME_MACHINE="alphapca56" ;;
	274	"EV5.7 (21164PC)")
	275	UNAME_MACHINE="alphapca57" ;;
	276	"EV6 (21264)")
	277	UNAME_MACHINE="alphaev6" ;;
	278	"EV6.7 (21264A)")
	279	UNAME_MACHINE="alphaev67" ;;
	280	"EV6.8CB (21264C)")
	281	UNAME_MACHINE="alphaev68" ;;
	282	"EV6.8AL (21264B)")
	283	UNAME_MACHINE="alphaev68" ;;
	284	"EV6.8CX (21264D)")
	285	UNAME_MACHINE="alphaev68" ;;
	286	"EV6.9A (21264/EV69A)")
	287	UNAME_MACHINE="alphaev69" ;;
	288	"EV7 (21364)")
	289	UNAME_MACHINE="alphaev7" ;;
	290	"EV7.9 (21364A)")
	291	UNAME_MACHINE="alphaev79" ;;
	292	esac
	293	# A Pn.n version is a patched version.
	294	# A Vn.n version is a released version.
	295	# A Tn.n version is a released field test version.
	296	# A Xn.n version is an unreleased experimental baselevel.
	297	# 1.2 uses "1.2" for uname -r.
	298	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} \| sed -e 's/^[PVTX]//' \| tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
	299	exit 0 ;;
	300	Alpha\ :Windows_NT:*)
	301	# How do we know it's Interix rather than the generic POSIX subsystem?
	302	# Should we change UNAME_MACHINE based on the output of uname instead
	303	# of the specific Alpha model?
	304	echo alpha-pc-interix
	305	exit 0 ;;
	306	21064:Windows_NT:50:3)
	307	echo alpha-dec-winnt3.5
	308	exit 0 ;;
	309	Amiga:UNIX_System_V:4.0:)
	310	echo m68k-unknown-sysv4
	311	exit 0;;
	312	:[Aa]miga[Oo][Ss]::*)
	313	echo ${UNAME_MACHINE}-unknown-amigaos
	314	exit 0 ;;
	315	:[Mm]orph[Oo][Ss]::*)
	316	echo ${UNAME_MACHINE}-unknown-morphos
	317	exit 0 ;;
	318	:OS/390::*)
	319	echo i370-ibm-openedition
	320	exit 0 ;;
	321	:z/VM::*)
	322	echo s390-ibm-zvmoe
	323	exit 0 ;;
	324	:OS400::*)
	325	echo powerpc-ibm-os400
	326	exit 0 ;;
	327	arm:RISC:1.[012]:\|arm:riscix:1.[012]:*)
	328	echo arm-acorn-riscix${UNAME_RELEASE}
	329	exit 0;;
	330	SR2?01:HI-UX/MPP:: \| SR8000:HI-UX/MPP::)
	331	echo hppa1.1-hitachi-hiuxmpp
	332	exit 0;;
	333	Pyramid:OSx:: \| MIS:OSx:: \| MIS:SMP_DC-OSx::)
	334	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
	335	if test "`(/bin/universe) 2>/dev/null`" = att ; then
	336	echo pyramid-pyramid-sysv3
	337	else
	338	echo pyramid-pyramid-bsd
	339	fi
	340	exit 0 ;;
	341	NILE::*:dcosx)
	342	echo pyramid-pyramid-svr4
	343	exit 0 ;;
	344	DRS?6000:unix:4.0:6*)
	345	echo sparc-icl-nx6
	346	exit 0 ;;
	347	DRS?6000:UNIX_SV:4.2:7 \| DRS?6000:isis:4.2:7)
	348	case `/usr/bin/uname -p` in
	349	sparc) echo sparc-icl-nx7 && exit 0 ;;
	350	esac ;;
	351	sun4H:SunOS:5.:)
	352	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}\|sed -e 's/[^.]*//'`
	353	exit 0 ;;
	354	sun4:SunOS:5.:* \| tadpole:SunOS:5.:*)
	355	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}\|sed -e 's/[^.]*//'`
	356	exit 0 ;;
	357	i86pc:SunOS:5.:)
	358	echo i386-pc-solaris2`echo ${UNAME_RELEASE}\|sed -e 's/[^.]*//'`
	359	exit 0 ;;
	360	sun4:SunOS:6:*)
	361	# According to config.sub, this is the proper way to canonicalize
	362	# SunOS6. Hard to guess exactly what SunOS6 will be like, but
	363	# it's likely to be more like Solaris than SunOS4.
	364	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}\|sed -e 's/[^.]*//'`
	365	exit 0 ;;
	366	sun4:SunOS::*)
	367	case "`/usr/bin/arch -k`" in
	368	Series\|S4)
	369	UNAME_RELEASE=`uname -v`
	370	;;
	371	esac
	372	# Japanese Language versions have a version number like `4.1.3-JL'.
	373	echo sparc-sun-sunos`echo ${UNAME_RELEASE}\|sed -e 's/-/_/'`
	374	exit 0 ;;
	375	sun3:SunOS::*)
	376	echo m68k-sun-sunos${UNAME_RELEASE}
	377	exit 0 ;;
	378	sun::4.2BSD:*)
	379	UNAME_RELEASE=`(sed 1q /etc/motd \| awk '{print substr($5,1,3)}') 2>/dev/null`
	380	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
	381	case "`/bin/arch`" in
	382	sun3)
	383	echo m68k-sun-sunos${UNAME_RELEASE}
	384	;;
	385	sun4)
	386	echo sparc-sun-sunos${UNAME_RELEASE}
	387	;;
	388	esac
	389	exit 0 ;;
	390	aushp:SunOS::)
	391	echo sparc-auspex-sunos${UNAME_RELEASE}
	392	exit 0 ;;
	393	# The situation for MiNT is a little confusing. The machine name
	394	# can be virtually everything (everything which is not
	395	# "atarist" or "atariste" at least should have a processor
	396	# > m68000). The system name ranges from "MiNT" over "FreeMiNT"
	397	# to the lowercase version "mint" (or "freemint"). Finally
	398	# the system name "TOS" denotes a system which is actually not
	399	# MiNT. But MiNT is downward compatible to TOS, so this should
	400	# be no problem.
	401	atarist[e]:MiNT::* \| atarist[e]:mint::* \| atarist[e]:TOS::*)
	402	echo m68k-atari-mint${UNAME_RELEASE}
	403	exit 0 ;;
	404	atari:MiNT:: \| atari:mint:: \| atarist[e]:TOS::*)
	405	echo m68k-atari-mint${UNAME_RELEASE}
	406	exit 0 ;;
	407	falcon:MiNT::* \| falcon:mint::* \| falcon:TOS::*)
	408	echo m68k-atari-mint${UNAME_RELEASE}
	409	exit 0 ;;
	410	milan:MiNT:: \| milan:mint:: \| milan:TOS::*)
	411	echo m68k-milan-mint${UNAME_RELEASE}
	412	exit 0 ;;
	413	hades:MiNT:: \| hades:mint:: \| hades:TOS::*)
	414	echo m68k-hades-mint${UNAME_RELEASE}
	415	exit 0 ;;
	416	:MiNT:: \| :mint:: \| :TOS::)
	417	echo m68k-unknown-mint${UNAME_RELEASE}
	418	exit 0 ;;
	419	m68k:machten::)
	420	echo m68k-apple-machten${UNAME_RELEASE}
	421	exit 0 ;;
	422	powerpc:machten::)
	423	echo powerpc-apple-machten${UNAME_RELEASE}
	424	exit 0 ;;
	425	RISC:Mach::*)
	426	echo mips-dec-mach_bsd4.3
	427	exit 0 ;;
	428	RISC:ULTRIX::*)
	429	echo mips-dec-ultrix${UNAME_RELEASE}
	430	exit 0 ;;
	431	VAX:ULTRIX::)
	432	echo vax-dec-ultrix${UNAME_RELEASE}
	433	exit 0 ;;
	434	2020:CLIX:: \| 2430:CLIX::)
	435	echo clipper-intergraph-clix${UNAME_RELEASE}
	436	exit 0 ;;
	437	mips:::UMIPS \| mips:::RISCos)
	438	eval $set_cc_for_build
	439	sed 's/^ //' << EOF >$dummy.c
	440	#ifdef __cplusplus
	441	#include <stdio.h> /* for printf() prototype */
	442	int main (int argc, char *argv[]) {
	443	#else
	444	int main (argc, argv) int argc; char *argv[]; {
	445	#endif
	446	#if defined (host_mips) && defined (MIPSEB)
	447	#if defined (SYSTYPE_SYSV)
	448	printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
	449	#endif
	450	#if defined (SYSTYPE_SVR4)
	451	printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
	452	#endif
	453	#if defined (SYSTYPE_BSD43) \|\| defined(SYSTYPE_BSD)
	454	printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
	455	#endif
	456	#endif
	457	exit (-1);
	458	}
	459	EOF
	460	$CC_FOR_BUILD -o $dummy $dummy.c \
	461	&& $dummy `echo "${UNAME_RELEASE}" \| sed -n 's/$[0-9]$./\1/p'` \
	462	&& exit 0
	463	echo mips-mips-riscos${UNAME_RELEASE}
	464	exit 0 ;;
	465	Motorola:PowerMAX_OS::)
	466	echo powerpc-motorola-powermax
	467	exit 0 ;;
	468	Motorola::4.3:PL8-)
	469	echo powerpc-harris-powermax
	470	exit 0 ;;
	471	Night_Hawk:::PowerMAX_OS \| Synergy:PowerMAX_OS::)
	472	echo powerpc-harris-powermax
	473	exit 0 ;;
	474	Night_Hawk:Power_UNIX::)
	475	echo powerpc-harris-powerunix
	476	exit 0 ;;
	477	m88k:CX/UX:7:)
	478	echo m88k-harris-cxux7
	479	exit 0 ;;
	480	m88k::4:R4*)
	481	echo m88k-motorola-sysv4
	482	exit 0 ;;
	483	m88k::3:R3*)
	484	echo m88k-motorola-sysv3
	485	exit 0 ;;
	486	AViiON:dgux::)
	487	# DG/UX returns AViiON for all architectures
	488	UNAME_PROCESSOR=`/usr/bin/uname -p`
	489	if [ $UNAME_PROCESSOR = mc88100 ] \|\| [ $UNAME_PROCESSOR = mc88110 ]
	490	then
	491	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] \|\| \
	492	[ ${TARGET_BINARY_INTERFACE}x = x ]
	493	then
	494	echo m88k-dg-dgux${UNAME_RELEASE}
	495	else
	496	echo m88k-dg-dguxbcs${UNAME_RELEASE}
	497	fi
	498	else
	499	echo i586-dg-dgux${UNAME_RELEASE}
	500	fi
	501	exit 0 ;;
	502	M88:DolphinOS::*) # DolphinOS (SVR3)
	503	echo m88k-dolphin-sysv3
	504	exit 0 ;;
	505	M88::R3:)
	506	# Delta 88k system running SVR3
	507	echo m88k-motorola-sysv3
	508	exit 0 ;;
	509	XD88:::) # Tektronix XD88 system running UTekV (SVR3)
	510	echo m88k-tektronix-sysv3
	511	exit 0 ;;
	512	Tek43[0-9][0-9]:UTek::) # Tektronix 4300 system running UTek (BSD)
	513	echo m68k-tektronix-bsd
	514	exit 0 ;;
	515	:IRIX::)
	516	echo mips-sgi-irix`echo ${UNAME_RELEASE}\|sed -e 's/-/_/g'`
	517	exit 0 ;;
	518	????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
	519	echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
	520	exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
	521	i86:AIX::*)
	522	echo i386-ibm-aix
	523	exit 0 ;;
	524	ia64:AIX::)
	525	if [ -x /usr/bin/oslevel ] ; then
	526	IBM_REV=`/usr/bin/oslevel`
	527	else
	528	IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
	529	fi
	530	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
	531	exit 0 ;;
	532	*:AIX:2:3)
	533	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
	534	eval $set_cc_for_build
	535	sed 's/^ //' << EOF >$dummy.c
	536	#include <sys/systemcfg.h>
	537
	538	main()
	539	{
	540	if (!__power_pc())
	541	exit(1);
	542	puts("powerpc-ibm-aix3.2.5");
	543	exit(0);
	544	}
	545	EOF
	546	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
	547	echo rs6000-ibm-aix3.2.5
	548	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
	549	echo rs6000-ibm-aix3.2.4
	550	else
	551	echo rs6000-ibm-aix3.2
	552	fi
	553	exit 0 ;;
	554	:AIX::[45])
	555	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available \| sed 1q \| awk '{ print $1 }'`
	556	if /usr/sbin/lsattr -El ${IBM_CPU_ID} \| grep ' POWER' >/dev/null 2>&1; then
	557	IBM_ARCH=rs6000
	558	else
	559	IBM_ARCH=powerpc
	560	fi
	561	if [ -x /usr/bin/oslevel ] ; then
	562	IBM_REV=`/usr/bin/oslevel`
	563	else
	564	IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
	565	fi
	566	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
	567	exit 0 ;;
	568	:AIX::*)
	569	echo rs6000-ibm-aix
	570	exit 0 ;;
	571	ibmrt:4.4BSD:\|romp-ibm:BSD:)
	572	echo romp-ibm-bsd4.4
	573	exit 0 ;;
	574	ibmrt:BSD:\|romp-ibm:BSD:*) # covers RT/PC BSD and
	575	echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
	576	exit 0 ;; # report: romp-ibm BSD 4.3
	577	:BOSX::*)
	578	echo rs6000-bull-bosx
	579	exit 0 ;;
	580	DPX/2?00:B.O.S.::)
	581	echo m68k-bull-sysv3
	582	exit 0 ;;
	583	9000/[34]??:4.3bsd:1.:)
	584	echo m68k-hp-bsd
	585	exit 0 ;;
	586	hp300:4.4BSD:: \| 9000/[34]??:4.3bsd:2.:)
	587	echo m68k-hp-bsd4.4
	588	exit 0 ;;
	589	9000/[34678]??:HP-UX::)
	590	HPUX_REV=`echo ${UNAME_RELEASE}\|sed -e 's/[^.].[0B]//'`
	591	case "${UNAME_MACHINE}" in
	592	9000/31? ) HP_ARCH=m68000 ;;
	593	9000/[34]?? ) HP_ARCH=m68k ;;
	594	9000/[678][0-9][0-9])
	595	if [ -x /usr/bin/getconf ]; then
	596	sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
	597	sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
	598	case "${sc_cpu_version}" in
	599	523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
	600	528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
	601	532) # CPU_PA_RISC2_0
	602	case "${sc_kernel_bits}" in
	603	32) HP_ARCH="hppa2.0n" ;;
	604	64) HP_ARCH="hppa2.0w" ;;
	605	'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
	606	esac ;;
	607	esac
	608	fi
	609	if [ "${HP_ARCH}" = "" ]; then
	610	eval $set_cc_for_build
	611	sed 's/^ //' << EOF >$dummy.c
	612
	613	#define _HPUX_SOURCE
	614	#include <stdlib.h>
	615	#include <unistd.h>
	616
	617	int main ()
	618	{
	619	#if defined(_SC_KERNEL_BITS)
	620	long bits = sysconf(_SC_KERNEL_BITS);
	621	#endif
	622	long cpu = sysconf (_SC_CPU_VERSION);
	623
	624	switch (cpu)
	625	{
	626	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
	627	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
	628	case CPU_PA_RISC2_0:
	629	#if defined(_SC_KERNEL_BITS)
	630	switch (bits)
	631	{
	632	case 64: puts ("hppa2.0w"); break;
	633	case 32: puts ("hppa2.0n"); break;
	634	default: puts ("hppa2.0"); break;
	635	} break;
	636	#else /* !defined(_SC_KERNEL_BITS) */
	637	puts ("hppa2.0"); break;
	638	#endif
	639	default: puts ("hppa1.0"); break;
	640	}
	641	exit (0);
	642	}
	643	EOF
	644	(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
	645	test -z "$HP_ARCH" && HP_ARCH=hppa
	646	fi ;;
	647	esac
	648	if [ ${HP_ARCH} = "hppa2.0w" ]
	649	then
	650	# avoid double evaluation of $set_cc_for_build
	651	test -n "$CC_FOR_BUILD" \|\| eval $set_cc_for_build
	652	if echo __LP64__ \| (CCOPTS= $CC_FOR_BUILD -E -) \| grep __LP64__ >/dev/null
	653	then
	654	HP_ARCH="hppa2.0w"
	655	else
	656	HP_ARCH="hppa64"
	657	fi
	658	fi
	659	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
	660	exit 0 ;;
	661	ia64:HP-UX::)
	662	HPUX_REV=`echo ${UNAME_RELEASE}\|sed -e 's/[^.].[0B]//'`
	663	echo ia64-hp-hpux${HPUX_REV}
	664	exit 0 ;;
	665	3050:HI-UX::*)
	666	eval $set_cc_for_build
	667	sed 's/^ //' << EOF >$dummy.c
	668	#include <unistd.h>
	669	int
	670	main ()
	671	{
	672	long cpu = sysconf (_SC_CPU_VERSION);
	673	/* The order matters, because CPU_IS_HP_MC68K erroneously returns
	674	true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
	675	results, however. */
	676	if (CPU_IS_PA_RISC (cpu))
	677	{
	678	switch (cpu)
	679	{
	680	case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
	681	case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
	682	case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
	683	default: puts ("hppa-hitachi-hiuxwe2"); break;
	684	}
	685	}
	686	else if (CPU_IS_HP_MC68K (cpu))
	687	puts ("m68k-hitachi-hiuxwe2");
	688	else puts ("unknown-hitachi-hiuxwe2");
	689	exit (0);
	690	}
	691	EOF
	692	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
	693	echo unknown-hitachi-hiuxwe2
	694	exit 0 ;;
	695	9000/7??:4.3bsd:: \| 9000/8?[79]:4.3bsd:: )
	696	echo hppa1.1-hp-bsd
	697	exit 0 ;;
	698	9000/8??:4.3bsd::)
	699	echo hppa1.0-hp-bsd
	700	exit 0 ;;
	701	9??:MPE/iX:: \| 3000:MPE/iX::)
	702	echo hppa1.0-hp-mpeix
	703	exit 0 ;;
	704	hp7??:OSF1:: \| hp8?[79]:OSF1:: )
	705	echo hppa1.1-hp-osf
	706	exit 0 ;;
	707	hp8??:OSF1::)
	708	echo hppa1.0-hp-osf
	709	exit 0 ;;
	710	i86:OSF1::*)
	711	if [ -x /usr/sbin/sysversion ] ; then
	712	echo ${UNAME_MACHINE}-unknown-osf1mk
	713	else
	714	echo ${UNAME_MACHINE}-unknown-osf1
	715	fi
	716	exit 0 ;;
	717	parisc:Lites::)
	718	echo hppa1.1-hp-lites
	719	exit 0 ;;
	720	C1:ConvexOS::* \| convex:ConvexOS:C1:)
	721	echo c1-convex-bsd
	722	exit 0 ;;
	723	C2:ConvexOS::* \| convex:ConvexOS:C2:)
	724	if getsysinfo -f scalar_acc
	725	then echo c32-convex-bsd
	726	else echo c2-convex-bsd
	727	fi
	728	exit 0 ;;
	729	C34:ConvexOS::* \| convex:ConvexOS:C34:)
	730	echo c34-convex-bsd
	731	exit 0 ;;
	732	C38:ConvexOS::* \| convex:ConvexOS:C38:)
	733	echo c38-convex-bsd
	734	exit 0 ;;
	735	C4:ConvexOS::* \| convex:ConvexOS:C4:)
	736	echo c4-convex-bsd
	737	exit 0 ;;
	738	CRAYY-MP:::)
	739	echo ymp-cray-unicos${UNAME_RELEASE} \| sed -e 's/\.[^.]*$/.X/'
	740	exit 0 ;;
	741	CRAY[A-Z]90:::)
	742	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
	743	\| sed -e 's/CRAY.*$[A-Z]90$/\1/' \
	744	-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
	745	-e 's/\.[^.]*$/.X/'
	746	exit 0 ;;
	747	CRAYTS:::)
	748	echo t90-cray-unicos${UNAME_RELEASE} \| sed -e 's/\.[^.]*$/.X/'
	749	exit 0 ;;
	750	CRAYT3E:::)
	751	echo alphaev5-cray-unicosmk${UNAME_RELEASE} \| sed -e 's/\.[^.]*$/.X/'
	752	exit 0 ;;
	753	CRAYSV1:::)
	754	echo sv1-cray-unicos${UNAME_RELEASE} \| sed -e 's/\.[^.]*$/.X/'
	755	exit 0 ;;
	756	:UNICOS/mp::*)
	757	echo craynv-cray-unicosmp${UNAME_RELEASE} \| sed -e 's/\.[^.]*$/.X/'
	758	exit 0 ;;
	759	F30[01]:UNIX_System_V:: \| F700:UNIX_System_V::)
	760	FUJITSU_PROC=`uname -m \| tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
	761	FUJITSU_SYS=`uname -p \| tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' \| sed -e 's/\///'`
	762	FUJITSU_REL=`echo ${UNAME_RELEASE} \| sed -e 's/ /_/'`
	763	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
	764	exit 0 ;;
	765	5000:UNIX_System_V:4.:)
	766	FUJITSU_SYS=`uname -p \| tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' \| sed -e 's/\///'`
	767	FUJITSU_REL=`echo ${UNAME_RELEASE} \| tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' \| sed -e 's/ /_/'`
	768	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
	769	exit 0 ;;
	770	i86:BSD/386::* \| i86:BSD/OS::* \| :Ascend\ Embedded/OS::*)
	771	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
	772	exit 0 ;;
	773	sparc:BSD/OS::*)
	774	echo sparc-unknown-bsdi${UNAME_RELEASE}
	775	exit 0 ;;
	776	:BSD/OS::*)
	777	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
	778	exit 0 ;;
	779	:FreeBSD::*)
	780	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}\|sed -e 's/[-(].*//'`
	781	exit 0 ;;
	782	i:CYGWIN:*)
	783	echo ${UNAME_MACHINE}-pc-cygwin
	784	exit 0 ;;
	785	i:MINGW:*)
	786	echo ${UNAME_MACHINE}-pc-mingw32
	787	exit 0 ;;
	788	i:PW:*)
	789	echo ${UNAME_MACHINE}-pc-pw32
	790	exit 0 ;;
	791	x86:Interix:[34])
	792	echo i586-pc-interix${UNAME_RELEASE}\|sed -e 's/\..*//'
	793	exit 0 ;;
	794	[345]86:Windows_95:* \| [345]86:Windows_98:* \| [345]86:Windows_NT:*)
	795	echo i${UNAME_MACHINE}-pc-mks
	796	exit 0 ;;
	797	i:Windows_NT:* \| Pentium:Windows_NT:*)
	798	# How do we know it's Interix rather than the generic POSIX subsystem?
	799	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
	800	# UNAME_MACHINE based on the output of uname instead of i386?
	801	echo i586-pc-interix
	802	exit 0 ;;
	803	i:UWIN:*)
	804	echo ${UNAME_MACHINE}-pc-uwin
	805	exit 0 ;;
	806	p:CYGWIN:*)
	807	echo powerpcle-unknown-cygwin
	808	exit 0 ;;
	809	prep:SunOS:5.:*)
	810	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}\|sed -e 's/[^.]*//'`
	811	exit 0 ;;
	812	:GNU::*)
	813	# the GNU system
	814	echo `echo ${UNAME_MACHINE}\|sed -e 's,[-/].$,,'`-unknown-gnu`echo ${UNAME_RELEASE}\|sed -e 's,/.$,,'`
	815	exit 0 ;;
	816	:GNU/::)
	817	# other systems with GNU libc and userland
	818	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} \| sed 's,^[^/]/,,' \| tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}\|sed -e 's/[-(].//'`-gnu
	819	exit 0 ;;
	820	i86:Minix::*)
	821	echo ${UNAME_MACHINE}-pc-minix
	822	exit 0 ;;
	823	arm:Linux::*)
	824	echo ${UNAME_MACHINE}-unknown-linux-gnu
	825	exit 0 ;;
	826	cris:Linux::)
	827	echo cris-axis-linux-gnu
	828	exit 0 ;;
	829	crisv32:Linux::)
	830	echo crisv32-axis-linux-gnu
	831	exit 0 ;;
	832	frv:Linux::)
	833	echo frv-unknown-linux-gnu
	834	exit 0 ;;
	835	ia64:Linux::)
	836	echo ${UNAME_MACHINE}-unknown-linux-gnu
	837	exit 0 ;;
	838	m32r:Linux::*)
	839	echo ${UNAME_MACHINE}-unknown-linux-gnu
	840	exit 0 ;;
	841	m68:Linux::*)
	842	echo ${UNAME_MACHINE}-unknown-linux-gnu
	843	exit 0 ;;
	844	mips:Linux::)
	845	eval $set_cc_for_build
	846	sed 's/^ //' << EOF >$dummy.c
	847	#undef CPU
	848	#undef mips
	849	#undef mipsel
	850	#if defined(__MIPSEL__) \|\| defined(__MIPSEL) \|\| defined(_MIPSEL) \|\| defined(MIPSEL)
	851	CPU=mipsel
	852	#else
	853	#if defined(__MIPSEB__) \|\| defined(__MIPSEB) \|\| defined(_MIPSEB) \|\| defined(MIPSEB)
	854	CPU=mips
	855	#else
	856	CPU=
	857	#endif
	858	#endif
	859	EOF
	860	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null \| grep ^CPU=`
	861	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
	862	;;
	863	mips64:Linux::)
	864	eval $set_cc_for_build
	865	sed 's/^ //' << EOF >$dummy.c
	866	#undef CPU
	867	#undef mips64
	868	#undef mips64el
	869	#if defined(__MIPSEL__) \|\| defined(__MIPSEL) \|\| defined(_MIPSEL) \|\| defined(MIPSEL)
	870	CPU=mips64el
	871	#else
	872	#if defined(__MIPSEB__) \|\| defined(__MIPSEB) \|\| defined(_MIPSEB) \|\| defined(MIPSEB)
	873	CPU=mips64
	874	#else
	875	CPU=
	876	#endif
	877	#endif
	878	EOF
	879	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null \| grep ^CPU=`
	880	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
	881	;;
	882	ppc:Linux::)
	883	echo powerpc-unknown-linux-gnu
	884	exit 0 ;;
	885	ppc64:Linux::)
	886	echo powerpc64-unknown-linux-gnu
	887	exit 0 ;;
	888	alpha:Linux::)
	889	case `sed -n '/^cpu model/s/^.: $.$/\1/p' < /proc/cpuinfo` in
	890	EV5) UNAME_MACHINE=alphaev5 ;;
	891	EV56) UNAME_MACHINE=alphaev56 ;;
	892	PCA56) UNAME_MACHINE=alphapca56 ;;
	893	PCA57) UNAME_MACHINE=alphapca56 ;;
	894	EV6) UNAME_MACHINE=alphaev6 ;;
	895	EV67) UNAME_MACHINE=alphaev67 ;;
	896	EV68*) UNAME_MACHINE=alphaev68 ;;
	897	esac
	898	objdump --private-headers /bin/sh \| grep ld.so.1 >/dev/null
	899	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
	900	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
	901	exit 0 ;;
	902	parisc:Linux:: \| hppa:Linux::)
	903	# Look for CPU level
	904	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null \| cut -d' ' -f2` in
	905	PA7*) echo hppa1.1-unknown-linux-gnu ;;
	906	PA8*) echo hppa2.0-unknown-linux-gnu ;;
	907	*) echo hppa-unknown-linux-gnu ;;
	908	esac
	909	exit 0 ;;
	910	parisc64:Linux:: \| hppa64:Linux::)
	911	echo hppa64-unknown-linux-gnu
	912	exit 0 ;;
	913	s390:Linux:: \| s390x:Linux::)
	914	echo ${UNAME_MACHINE}-ibm-linux
	915	exit 0 ;;
	916	sh64:Linux::*)
	917	echo ${UNAME_MACHINE}-unknown-linux-gnu
	918	exit 0 ;;
	919	sh:Linux::*)
	920	echo ${UNAME_MACHINE}-unknown-linux-gnu
	921	exit 0 ;;
	922	sparc:Linux:: \| sparc64:Linux::)
	923	echo ${UNAME_MACHINE}-unknown-linux-gnu
	924	exit 0 ;;
	925	x86_64:Linux::)
	926	echo x86_64-unknown-linux-gnu
	927	exit 0 ;;
	928	i86:Linux::*)
	929	# The BFD linker knows what the default object file format is, so
	930	# first see if it will tell us. cd to the root directory to prevent
	931	# problems with other programs or directories called `ld' in the path.
	932	# Set LC_ALL=C to ensure ld outputs messages in English.
	933	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
	934	\| sed -ne '/supported targets:/!d
	935	s/[ ][ ]*/ /g
	936	s/.supported targets: //
	937	s/ .*//
	938	p'`
	939	case "$ld_supported_targets" in
	940	elf32-i386)
	941	TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
	942	;;
	943	a.out-i386-linux)
	944	echo "${UNAME_MACHINE}-pc-linux-gnuaout"
	945	exit 0 ;;
	946	coff-i386)
	947	echo "${UNAME_MACHINE}-pc-linux-gnucoff"
	948	exit 0 ;;
	949	"")
	950	# Either a pre-BFD a.out linker (linux-gnuoldld) or
	951	# one that does not give us useful --help.
	952	echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
	953	exit 0 ;;
	954	esac
	955	# Determine whether the default compiler is a.out or elf
	956	eval $set_cc_for_build
	957	sed 's/^ //' << EOF >$dummy.c
	958	#include <features.h>
	959	#ifdef __ELF__
	960	# ifdef __GLIBC__
	961	# if __GLIBC__ >= 2
	962	LIBC=gnu
	963	# else
	964	LIBC=gnulibc1
	965	# endif
	966	# else
	967	LIBC=gnulibc1
	968	# endif
	969	#else
	970	#ifdef __INTEL_COMPILER
	971	LIBC=gnu
	972	#else
	973	LIBC=gnuaout
	974	#endif
	975	#endif
	976	#ifdef __dietlibc__
	977	LIBC=dietlibc
	978	#endif
	979	EOF
	980	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null \| grep ^LIBC=`
	981	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
	982	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
	983	;;
	984	i86:DYNIX/ptx:4:*)
	985	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
	986	# earlier versions are messed up and put the nodename in both
	987	# sysname and nodename.
	988	echo i386-sequent-sysv4
	989	exit 0 ;;
	990	i86:UNIX_SV:4.2MP:2.)
	991	# Unixware is an offshoot of SVR4, but it has its own version
	992	# number series starting with 2...
	993	# I am not positive that other SVR4 systems won't match this,
	994	# I just have to hope. -- rms.
	995	# Use sysv4.2uw... so that sysv4* matches it.
	996	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
	997	exit 0 ;;
	998	i86:OS/2::*)
	999	# If we were able to find `uname', then EMX Unix compatibility
	1000	# is probably installed.
	1001	echo ${UNAME_MACHINE}-pc-os2-emx
	1002	exit 0 ;;
	1003	i86:XTS-300::STOP)
	1004	echo ${UNAME_MACHINE}-unknown-stop
	1005	exit 0 ;;
	1006	i86:atheos::*)
	1007	echo ${UNAME_MACHINE}-unknown-atheos
	1008	exit 0 ;;
	1009	i86:syllable::*)
	1010	echo ${UNAME_MACHINE}-pc-syllable
	1011	exit 0 ;;
	1012	i86:LynxOS:2.:* \| i86:LynxOS:3.[01]:* \| i86:LynxOS:4.0:*)
	1013	echo i386-unknown-lynxos${UNAME_RELEASE}
	1014	exit 0 ;;
	1015	i86:DOS::)
	1016	echo ${UNAME_MACHINE}-pc-msdosdjgpp
	1017	exit 0 ;;
	1018	i86::4.: \| i86:SYSTEM_V:4.:*)
	1019	UNAME_REL=`echo ${UNAME_RELEASE} \| sed 's/\/MP$//'`
	1020	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
	1021	echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
	1022	else
	1023	echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
	1024	fi
	1025	exit 0 ;;
	1026	i86::5:[78]*)
	1027	case `/bin/uname -X \| grep "^Machine"` in
	1028	486) UNAME_MACHINE=i486 ;;
	1029	*Pentium) UNAME_MACHINE=i586 ;;
	1030	Pent\|*Celeron) UNAME_MACHINE=i686 ;;
	1031	esac
	1032	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
	1033	exit 0 ;;
	1034	i86::3.2:*)
	1035	if test -f /usr/options/cb.name; then
	1036	UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
	1037	echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
	1038	elif /bin/uname -X 2>/dev/null >/dev/null ; then
	1039	UNAME_REL=`(/bin/uname -X\|grep Release\|sed -e 's/.*= //')`
	1040	(/bin/uname -X\|grep i80486 >/dev/null) && UNAME_MACHINE=i486
	1041	(/bin/uname -X\|grep '^Machine.*Pentium' >/dev/null) \
	1042	&& UNAME_MACHINE=i586
	1043	(/bin/uname -X\|grep '^Machine.Pent II' >/dev/null) \
	1044	&& UNAME_MACHINE=i686
	1045	(/bin/uname -X\|grep '^Machine.*Pentium Pro' >/dev/null) \
	1046	&& UNAME_MACHINE=i686
	1047	echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
	1048	else
	1049	echo ${UNAME_MACHINE}-pc-sysv32
	1050	fi
	1051	exit 0 ;;
	1052	pc:::*)
	1053	# Left here for compatibility:
	1054	# uname -m prints for DJGPP always 'pc', but it prints nothing about
	1055	# the processor, so we play safe by assuming i386.
	1056	echo i386-pc-msdosdjgpp
	1057	exit 0 ;;
	1058	Intel:Mach:3:)
	1059	echo i386-pc-mach3
	1060	exit 0 ;;
	1061	paragon:::*)
	1062	echo i860-intel-osf1
	1063	exit 0 ;;
	1064	i860::4.:*) # i860-SVR4
	1065	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
	1066	echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
	1067	else # Add other i860-SVR4 vendors below as they are discovered.
	1068	echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
	1069	fi
	1070	exit 0 ;;
	1071	mini:CTIX:SYS5:*)
	1072	# "miniframe"
	1073	echo m68010-convergent-sysv
	1074	exit 0 ;;
	1075	mc68k:UNIX:SYSTEM5:3.51m)
	1076	echo m68k-convergent-sysv
	1077	exit 0 ;;
	1078	M680?0:D-NIX:5.3:*)
	1079	echo m68k-diab-dnix
	1080	exit 0 ;;
	1081	M68::R3V[5678]:)
	1082	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
	1083	3[345]??::4.0:3.0 \| 3[34]??A::4.0:3.0 \| 3[34]??,::4.0:3.0 \| 3[34]??/::4.0:3.0 \| 4400::4.0:3.0 \| 4850::4.0:3.0 \| SKA40::4.0:3.0 \| SDS2::4.0:3.0 \| SHG2::4.0:3.0 \| S7501:*:4.0:3.0)
	1084	OS_REL=''
	1085	test -r /etc/.relid \
	1086	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
	1087	/bin/uname -p 2>/dev/null \| grep 86 >/dev/null \
	1088	&& echo i486-ncr-sysv4.3${OS_REL} && exit 0
	1089	/bin/uname -p 2>/dev/null \| /bin/grep entium >/dev/null \
	1090	&& echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
	1091	3[34]??::4.0: \| 3[34]??,::4.0:*)
	1092	/bin/uname -p 2>/dev/null \| grep 86 >/dev/null \
	1093	&& echo i486-ncr-sysv4 && exit 0 ;;
	1094	m68:LynxOS:2.:* \| m68:LynxOS:3.0:*)
	1095	echo m68k-unknown-lynxos${UNAME_RELEASE}
	1096	exit 0 ;;
	1097	mc68030:UNIX_System_V:4.:)
	1098	echo m68k-atari-sysv4
	1099	exit 0 ;;
	1100	TSUNAMI:LynxOS:2.:)
	1101	echo sparc-unknown-lynxos${UNAME_RELEASE}
	1102	exit 0 ;;
	1103	rs6000:LynxOS:2.:)
	1104	echo rs6000-unknown-lynxos${UNAME_RELEASE}
	1105	exit 0 ;;
	1106	PowerPC:LynxOS:2.: \| PowerPC:LynxOS:3.[01]: \| PowerPC:LynxOS:4.0:)
	1107	echo powerpc-unknown-lynxos${UNAME_RELEASE}
	1108	exit 0 ;;
	1109	SM[BE]S:UNIX_SV::)
	1110	echo mips-dde-sysv${UNAME_RELEASE}
	1111	exit 0 ;;
	1112	RM:ReliantUNIX-::)
	1113	echo mips-sni-sysv4
	1114	exit 0 ;;
	1115	RM:SINIX-::)
	1116	echo mips-sni-sysv4
	1117	exit 0 ;;
	1118	:SINIX-::)
	1119	if uname -p 2>/dev/null >/dev/null ; then
	1120	UNAME_MACHINE=`(uname -p) 2>/dev/null`
	1121	echo ${UNAME_MACHINE}-sni-sysv4
	1122	else
	1123	echo ns32k-sni-sysv
	1124	fi
	1125	exit 0 ;;
	1126	PENTIUM::4.0:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
	1127	# says <Richard.M.Bartel@ccMail.Census.GOV>
	1128	echo i586-unisys-sysv4
	1129	exit 0 ;;
	1130	:UNIX_System_V:4:FTX*)
	1131	# From Gerald Hewes <hewes@openmarket.com>.
	1132	# How about differentiating between stratus architectures? -djm
	1133	echo hppa1.1-stratus-sysv4
	1134	exit 0 ;;
	1135	:::FTX)
	1136	# From seanf@swdc.stratus.com.
	1137	echo i860-stratus-sysv4
	1138	exit 0 ;;
	1139	:VOS::*)
	1140	# From Paul.Green@stratus.com.
	1141	echo hppa1.1-stratus-vos
	1142	exit 0 ;;
	1143	mc68:A/UX::*)
	1144	echo m68k-apple-aux${UNAME_RELEASE}
	1145	exit 0 ;;
	1146	news:NEWS-OS:6:*)
	1147	echo mips-sony-newsos6
	1148	exit 0 ;;
	1149	R[34]000:System_V:: \| R4000:UNIX_SYSV:: \| R000:UNIX_SV::*)
	1150	if [ -d /usr/nec ]; then
	1151	echo mips-nec-sysv${UNAME_RELEASE}
	1152	else
	1153	echo mips-unknown-sysv${UNAME_RELEASE}
	1154	fi
	1155	exit 0 ;;
	1156	BeBox:BeOS::) # BeOS running on hardware made by Be, PPC only.
	1157	echo powerpc-be-beos
	1158	exit 0 ;;
	1159	BeMac:BeOS::) # BeOS running on Mac or Mac clone, PPC only.
	1160	echo powerpc-apple-beos
	1161	exit 0 ;;
	1162	BePC:BeOS::) # BeOS running on Intel PC compatible.
	1163	echo i586-pc-beos
	1164	exit 0 ;;
	1165	SX-4:SUPER-UX::)
	1166	echo sx4-nec-superux${UNAME_RELEASE}
	1167	exit 0 ;;
	1168	SX-5:SUPER-UX::)
	1169	echo sx5-nec-superux${UNAME_RELEASE}
	1170	exit 0 ;;
	1171	SX-6:SUPER-UX::)
	1172	echo sx6-nec-superux${UNAME_RELEASE}
	1173	exit 0 ;;
	1174	Power:Rhapsody::*)
	1175	echo powerpc-apple-rhapsody${UNAME_RELEASE}
	1176	exit 0 ;;
	1177	:Rhapsody::*)
	1178	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
	1179	exit 0 ;;
	1180	:Darwin::*)
	1181	UNAME_PROCESSOR=`uname -p` \|\| UNAME_PROCESSOR=unknown
	1182	case $UNAME_PROCESSOR in
	1183	*86) UNAME_PROCESSOR=i686 ;;
	1184	unknown) UNAME_PROCESSOR=powerpc ;;
	1185	esac
	1186	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
	1187	exit 0 ;;
	1188	:procnto:: \| :QNX:[0123456789]:*)
	1189	UNAME_PROCESSOR=`uname -p`
	1190	if test "$UNAME_PROCESSOR" = "x86"; then
	1191	UNAME_PROCESSOR=i386
	1192	UNAME_MACHINE=pc
	1193	fi
	1194	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
	1195	exit 0 ;;
	1196	:QNX::4*)
	1197	echo i386-pc-qnx
	1198	exit 0 ;;
	1199	NSR-?:NONSTOP_KERNEL::)
	1200	echo nsr-tandem-nsk${UNAME_RELEASE}
	1201	exit 0 ;;
	1202	:NonStop-UX::*)
	1203	echo mips-compaq-nonstopux
	1204	exit 0 ;;
	1205	BS2000:POSIX::*)
	1206	echo bs2000-siemens-sysv
	1207	exit 0 ;;
	1208	DS/:UNIX_System_V::*)
	1209	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
	1210	exit 0 ;;
	1211	:Plan9::*)
	1212	# "uname -m" is not consistent, so use $cputype instead. 386
	1213	# is converted to i386 for consistency with other x86
	1214	# operating systems.
	1215	if test "$cputype" = "386"; then
	1216	UNAME_MACHINE=i386
	1217	else
	1218	UNAME_MACHINE="$cputype"
	1219	fi
	1220	echo ${UNAME_MACHINE}-unknown-plan9
	1221	exit 0 ;;
	1222	:TOPS-10::*)
	1223	echo pdp10-unknown-tops10
	1224	exit 0 ;;
	1225	:TENEX::*)
	1226	echo pdp10-unknown-tenex
	1227	exit 0 ;;
	1228	KS10:TOPS-20:: \| KL10:TOPS-20:: \| TYPE4:TOPS-20::)
	1229	echo pdp10-dec-tops20
	1230	exit 0 ;;
	1231	XKL-1:TOPS-20:: \| TYPE5:TOPS-20::)
	1232	echo pdp10-xkl-tops20
	1233	exit 0 ;;
	1234	:TOPS-20::*)
	1235	echo pdp10-unknown-tops20
	1236	exit 0 ;;
	1237	:ITS::*)
	1238	echo pdp10-unknown-its
	1239	exit 0 ;;
	1240	SEI:::SEIUX)
	1241	echo mips-sei-seiux${UNAME_RELEASE}
	1242	exit 0 ;;
	1243	:DragonFly::*)
	1244	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}\|sed -e 's/[-(].*//'`
	1245	exit 0 ;;
	1246	:VMS::)
	1247	UNAME_MACHINE=`(uname -p) 2>/dev/null`
	1248	case "${UNAME_MACHINE}" in
	1249	A*) echo alpha-dec-vms && exit 0 ;;
	1250	I*) echo ia64-dec-vms && exit 0 ;;
	1251	V*) echo vax-dec-vms && exit 0 ;;
	1252	esac ;;
	1253	:XENIX::SysV)
	1254	echo i386-pc-xenix
	1255	exit 0 ;;
	1256	esac
	1257
	1258	#echo '(No uname command or uname output not recognized.)' 1>&2
	1259	#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
	1260
	1261	eval $set_cc_for_build
	1262	cat >$dummy.c <<EOF
	1263	#ifdef _SEQUENT_
	1264	# include <sys/types.h>
	1265	# include <sys/utsname.h>
	1266	#endif
	1267	main ()
	1268	{
	1269	#if defined (sony)
	1270	#if defined (MIPSEB)
	1271	/* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
	1272	I don't know.... */
	1273	printf ("mips-sony-bsd\n"); exit (0);
	1274	#else
	1275	#include <sys/param.h>
	1276	printf ("m68k-sony-newsos%s\n",
	1277	#ifdef NEWSOS4
	1278	"4"
	1279	#else
	1280	""
	1281	#endif
	1282	); exit (0);
	1283	#endif
	1284	#endif
	1285
	1286	#if defined (__arm) && defined (__acorn) && defined (__unix)
	1287	printf ("arm-acorn-riscix"); exit (0);
	1288	#endif
	1289
	1290	#if defined (hp300) && !defined (hpux)
	1291	printf ("m68k-hp-bsd\n"); exit (0);
	1292	#endif
	1293
	1294	#if defined (NeXT)
	1295	#if !defined (__ARCHITECTURE__)
	1296	#define __ARCHITECTURE__ "m68k"
	1297	#endif
	1298	int version;
	1299	version=`(hostinfo \| sed -n 's/.NeXT Mach $[0-9]$.*/\1/p') 2>/dev/null`;
	1300	if (version < 4)
	1301	printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
	1302	else
	1303	printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
	1304	exit (0);
	1305	#endif
	1306
	1307	#if defined (MULTIMAX) \|\| defined (n16)
	1308	#if defined (UMAXV)
	1309	printf ("ns32k-encore-sysv\n"); exit (0);
	1310	#else
	1311	#if defined (CMU)
	1312	printf ("ns32k-encore-mach\n"); exit (0);
	1313	#else
	1314	printf ("ns32k-encore-bsd\n"); exit (0);
	1315	#endif
	1316	#endif
	1317	#endif
	1318
	1319	#if defined (__386BSD__)
	1320	printf ("i386-pc-bsd\n"); exit (0);
	1321	#endif
	1322
	1323	#if defined (sequent)
	1324	#if defined (i386)
	1325	printf ("i386-sequent-dynix\n"); exit (0);
	1326	#endif
	1327	#if defined (ns32000)
	1328	printf ("ns32k-sequent-dynix\n"); exit (0);
	1329	#endif
	1330	#endif
	1331
	1332	#if defined (_SEQUENT_)
	1333	struct utsname un;
	1334
	1335	uname(&un);
	1336
	1337	if (strncmp(un.version, "V2", 2) == 0) {
	1338	printf ("i386-sequent-ptx2\n"); exit (0);
	1339	}
	1340	if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
	1341	printf ("i386-sequent-ptx1\n"); exit (0);
	1342	}
	1343	printf ("i386-sequent-ptx\n"); exit (0);
	1344
	1345	#endif
	1346
	1347	#if defined (vax)
	1348	# if !defined (ultrix)
	1349	# include <sys/param.h>
	1350	# if defined (BSD)
	1351	# if BSD == 43
	1352	printf ("vax-dec-bsd4.3\n"); exit (0);
	1353	# else
	1354	# if BSD == 199006
	1355	printf ("vax-dec-bsd4.3reno\n"); exit (0);
	1356	# else
	1357	printf ("vax-dec-bsd\n"); exit (0);
	1358	# endif
	1359	# endif
	1360	# else
	1361	printf ("vax-dec-bsd\n"); exit (0);
	1362	# endif
	1363	# else
	1364	printf ("vax-dec-ultrix\n"); exit (0);
	1365	# endif
	1366	#endif
	1367
	1368	#if defined (alliant) && defined (i860)
	1369	printf ("i860-alliant-bsd\n"); exit (0);
	1370	#endif
	1371
	1372	exit (1);
	1373	}
	1374	EOF
	1375
	1376	$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
	1377
	1378	# Apollos put the system type in the environment.
	1379
	1380	test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
	1381
	1382	# Convex versions that predate uname can use getsysinfo(1)
	1383
	1384	if [ -x /usr/convex/getsysinfo ]
	1385	then
	1386	case `getsysinfo -f cpu_type` in
	1387	c1*)
	1388	echo c1-convex-bsd
	1389	exit 0 ;;
	1390	c2*)
	1391	if getsysinfo -f scalar_acc
	1392	then echo c32-convex-bsd
	1393	else echo c2-convex-bsd
	1394	fi
	1395	exit 0 ;;
	1396	c34*)
	1397	echo c34-convex-bsd
	1398	exit 0 ;;
	1399	c38*)
	1400	echo c38-convex-bsd
	1401	exit 0 ;;
	1402	c4*)
	1403	echo c4-convex-bsd
	1404	exit 0 ;;
	1405	esac
	1406	fi
	1407
	1408	cat >&2 <<EOF
	1409	$0: unable to guess system type
	1410
	1411	This script, last modified $timestamp, has failed to recognize
	1412	the operating system you are using. It is advised that you
	1413	download the most up to date version of the config scripts from
	1414
	1415	ftp://ftp.gnu.org/pub/gnu/config/
	1416
	1417	If the version you run ($0) is already up to date, please
	1418	send the following data and any information you think might be
	1419	pertinent to <config-patches@gnu.org> in order to provide the needed
	1420	information to handle your system.
	1421
	1422	config.guess timestamp = $timestamp
	1423
	1424	uname -m = `(uname -m) 2>/dev/null \|\| echo unknown`
	1425	uname -r = `(uname -r) 2>/dev/null \|\| echo unknown`
	1426	uname -s = `(uname -s) 2>/dev/null \|\| echo unknown`
	1427	uname -v = `(uname -v) 2>/dev/null \|\| echo unknown`
	1428
	1429	/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
	1430	/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
	1431
	1432	hostinfo = `(hostinfo) 2>/dev/null`
	1433	/bin/universe = `(/bin/universe) 2>/dev/null`
	1434	/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
	1435	/bin/arch = `(/bin/arch) 2>/dev/null`
	1436	/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
	1437	/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
	1438
	1439	UNAME_MACHINE = ${UNAME_MACHINE}
	1440	UNAME_RELEASE = ${UNAME_RELEASE}
	1441	UNAME_SYSTEM = ${UNAME_SYSTEM}
	1442	UNAME_VERSION = ${UNAME_VERSION}
	1443	EOF
	1444
	1445	exit 1
	1446
	1447	# Local variables:
	1448	# eval: (add-hook 'write-file-hooks 'time-stamp)
	1449	# time-stamp-start: "timestamp='"
	1450	# time-stamp-format: "%:y-%02m-%02d"
	1451	# time-stamp-end: "'"
	1452	# End:

-6

config.sub less more

0	0	#! /bin/sh
1	1	# Configuration validation subroutine script.
2	2	# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
3		# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
4
5		timestamp='2004-11-30'
	3	# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
	4
	5	timestamp='2005-02-10'
6	6
7	7	# This file is (in principle) common to ALL GNU software.
8	8	# The presence of a machine in this file suggests that SOME GNU software

69	69	version="\
70	70	GNU config.sub ($timestamp)
71	71
72		Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
	72	Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
73	73	Free Software Foundation, Inc.
74	74
75	75	This is free software; see the source for copying conditions. There is NO

236	236	\| h8300 \| h8500 \| hppa \| hppa1.[01] \| hppa2.0 \| hppa2.0[nw] \| hppa64 \
237	237	\| i370 \| i860 \| i960 \| ia64 \
238	238	\| ip2k \| iq2000 \
239		\| m32r \| m32rle \| m68000 \| m68k \| m88k \| mcore \
	239	\| m32r \| m32rle \| m68000 \| m68k \| m88k \| maxq \| mcore \
240	240	\| mips \| mipsbe \| mipseb \| mipsel \| mipsle \
241	241	\| mips16 \
242	242	\| mips64 \| mips64el \

309	309	\| ip2k-* \| iq2000-* \
310	310	\| m32r-* \| m32rle-* \
311	311	\| m68000-* \| m680[012346]0-* \| m68360-* \| m683?2-* \| m68k-* \
312		\| m88110-* \| m88k-* \| mcore-* \
	312	\| m88110-* \| m88k-* \| maxq-* \| mcore-* \
313	313	\| mips-* \| mipsbe-* \| mipseb-* \| mipsel-* \| mipsle-* \
314	314	\| mips16-* \
315	315	\| mips64-* \| mips64el-* \

+1566

-0

config.sub.cdbs-orig less more

	0	#! /bin/sh
	1	# Configuration validation subroutine script.
	2	# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
	3	# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
	4
	5	timestamp='2004-11-30'
	6
	7	# This file is (in principle) common to ALL GNU software.
	8	# The presence of a machine in this file suggests that SOME GNU software
	9	# can handle that machine. It does not imply ALL GNU software can.
	10	#
	11	# This file is free software; you can redistribute it and/or modify
	12	# it under the terms of the GNU General Public License as published by
	13	# the Free Software Foundation; either version 2 of the License, or
	14	# (at your option) any later version.
	15	#
	16	# This program is distributed in the hope that it will be useful,
	17	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	18	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	19	# GNU General Public License for more details.
	20	#
	21	# You should have received a copy of the GNU General Public License
	22	# along with this program; if not, write to the Free Software
	23	# Foundation, Inc., 59 Temple Place - Suite 330,
	24	# Boston, MA 02111-1307, USA.
	25
	26	# As a special exception to the GNU General Public License, if you
	27	# distribute this file as part of a program that contains a
	28	# configuration script generated by Autoconf, you may include it under
	29	# the same distribution terms that you use for the rest of that program.
	30
	31	# Please send patches to <config-patches@gnu.org>. Submit a context
	32	# diff and a properly formatted ChangeLog entry.
	33	#
	34	# Configuration subroutine to validate and canonicalize a configuration type.
	35	# Supply the specified configuration type as an argument.
	36	# If it is invalid, we print an error message on stderr and exit with code 1.
	37	# Otherwise, we print the canonical config type on stdout and succeed.
	38
	39	# This file is supposed to be the same for all GNU packages
	40	# and recognize all the CPU types, system types and aliases
	41	# that are meaningful with any GNU software.
	42	# Each package is responsible for reporting which valid configurations
	43	# it does not support. The user should be able to distinguish
	44	# a failure to support a valid configuration from a meaningless
	45	# configuration.
	46
	47	# The goal of this file is to map all the various variations of a given
	48	# machine specification into a single specification in the form:
	49	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
	50	# or in some cases, the newer four-part form:
	51	# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
	52	# It is wrong to echo any other type of specification.
	53
	54	me=`echo "$0" \| sed -e 's,.*/,,'`
	55
	56	usage="\
	57	Usage: $0 [OPTION] CPU-MFR-OPSYS
	58	$0 [OPTION] ALIAS
	59
	60	Canonicalize a configuration name.
	61
	62	Operation modes:
	63	-h, --help print this help, then exit
	64	-t, --time-stamp print date of last modification, then exit
	65	-v, --version print version number, then exit
	66
	67	Report bugs and patches to <config-patches@gnu.org>."
	68
	69	version="\
	70	GNU config.sub ($timestamp)
	71
	72	Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
	73	Free Software Foundation, Inc.
	74
	75	This is free software; see the source for copying conditions. There is NO
	76	warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
	77
	78	help="
	79	Try \`$me --help' for more information."
	80
	81	# Parse command line
	82	while test $# -gt 0 ; do
	83	case $1 in
	84	--time-stamp \| --time* \| -t )
	85	echo "$timestamp" ; exit 0 ;;
	86	--version \| -v )
	87	echo "$version" ; exit 0 ;;
	88	--help \| --h* \| -h )
	89	echo "$usage"; exit 0 ;;
	90	-- ) # Stop option processing
	91	shift; break ;;
	92	- ) # Use stdin as input.
	93	break ;;
	94	-* )
	95	echo "$me: invalid option $1$help"
	96	exit 1 ;;
	97
	98	local)
	99	# First pass through any local machine types.
	100	echo $1
	101	exit 0;;
	102
	103	* )
	104	break ;;
	105	esac
	106	done
	107
	108	case $# in
	109	0) echo "$me: missing argument$help" >&2
	110	exit 1;;
	111	1) ;;
	112	*) echo "$me: too many arguments$help" >&2
	113	exit 1;;
	114	esac
	115
	116	# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
	117	# Here we must recognize all the valid KERNEL-OS combinations.
	118	maybe_os=`echo $1 \| sed 's/^$.$-$[^-]-[^-]*$$/\2/'`
	119	case $maybe_os in
	120	nto-qnx* \| linux-gnu* \| linux-dietlibc \| linux-uclibc* \| uclinux-uclibc* \| uclinux-gnu* \| \
	121	kfreebsd-gnu \| knetbsd-gnu \| netbsd-gnu \| storm-chaos* \| os2-emx* \| rtmk-nova*)
	122	os=-$maybe_os
	123	basic_machine=`echo $1 \| sed 's/^$.$-$[^-]-[^-]*$$/\1/'`
	124	;;
	125	*)
	126	basic_machine=`echo $1 \| sed 's/-[^-]*$//'`
	127	if [ $basic_machine != $1 ]
	128	then os=`echo $1 \| sed 's/.*-/-/'`
	129	else os=; fi
	130	;;
	131	esac
	132
	133	### Let's recognize common machines as not being operating systems so
	134	### that things like config.sub decstation-3100 work. We also
	135	### recognize some manufacturers as not being operating systems, so we
	136	### can provide default operating systems below.
	137	case $os in
	138	-sunos)
	139	# Prevent following clause from handling this invalid input.
	140	;;
	141	-dec* \| -mips* \| -sequent* \| -encore* \| -pc532* \| -sgi* \| -sony* \| \
	142	-att* \| -7300* \| -3300* \| -delta* \| -motorola* \| -sun[234]* \| \
	143	-unicom* \| -ibm* \| -next \| -hp \| -isi* \| -apollo \| -altos* \| \
	144	-convergent* \| -ncr* \| -news \| -32* \| -3600* \| -3100* \| -hitachi* \|\
	145	-c[123]* \| -convex* \| -sun \| -crds \| -omron* \| -dg \| -ultra \| -tti* \| \
	146	-harris \| -dolphin \| -highlevel \| -gould \| -cbm \| -ns \| -masscomp \| \
	147	-apple \| -axis \| -knuth \| -cray)
	148	os=
	149	basic_machine=$1
	150	;;
	151	-sim \| -cisco \| -oki \| -wec \| -winbond)
	152	os=
	153	basic_machine=$1
	154	;;
	155	-scout)
	156	;;
	157	-wrs)
	158	os=-vxworks
	159	basic_machine=$1
	160	;;
	161	-chorusos*)
	162	os=-chorusos
	163	basic_machine=$1
	164	;;
	165	-chorusrdb)
	166	os=-chorusrdb
	167	basic_machine=$1
	168	;;
	169	-hiux*)
	170	os=-hiuxwe2
	171	;;
	172	-sco5)
	173	os=-sco3.2v5
	174	basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	175	;;
	176	-sco4)
	177	os=-sco3.2v4
	178	basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	179	;;
	180	-sco3.2.[4-9]*)
	181	os=`echo $os \| sed -e 's/sco3.2./sco3.2v/'`
	182	basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	183	;;
	184	-sco3.2v[4-9]*)
	185	# Don't forget version if it is 3.2v4 or newer.
	186	basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	187	;;
	188	-sco*)
	189	os=-sco3.2v2
	190	basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	191	;;
	192	-udk*)
	193	basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	194	;;
	195	-isc)
	196	os=-isc2.2
	197	basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	198	;;
	199	-clix*)
	200	basic_machine=clipper-intergraph
	201	;;
	202	-isc*)
	203	basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	204	;;
	205	-lynx*)
	206	os=-lynxos
	207	;;
	208	-ptx*)
	209	basic_machine=`echo $1 \| sed -e 's/86-.*/86-sequent/'`
	210	;;
	211	-windowsnt*)
	212	os=`echo $os \| sed -e 's/windowsnt/winnt/'`
	213	;;
	214	-psos*)
	215	os=-psos
	216	;;
	217	-mint \| -mint[0-9]*)
	218	basic_machine=m68k-atari
	219	os=-mint
	220	;;
	221	esac
	222
	223	# Decode aliases for certain CPU-COMPANY combinations.
	224	case $basic_machine in
	225	# Recognize the basic CPU types without company name.
	226	# Some are omitted here because they have special meanings below.
	227	1750a \| 580 \
	228	\| a29k \
	229	\| alpha \| alphaev[4-8] \| alphaev56 \| alphaev6[78] \| alphapca5[67] \
	230	\| alpha64 \| alpha64ev[4-8] \| alpha64ev56 \| alpha64ev6[78] \| alpha64pca5[67] \
	231	\| am33_2.0 \
	232	\| arc \| arm \| arm[bl]e \| arme[lb] \| armv[2345] \| armv[345][lb] \| avr \
	233	\| c4x \| clipper \
	234	\| d10v \| d30v \| dlx \| dsp16xx \
	235	\| fr30 \| frv \
	236	\| h8300 \| h8500 \| hppa \| hppa1.[01] \| hppa2.0 \| hppa2.0[nw] \| hppa64 \
	237	\| i370 \| i860 \| i960 \| ia64 \
	238	\| ip2k \| iq2000 \
	239	\| m32r \| m32rle \| m68000 \| m68k \| m88k \| mcore \
	240	\| mips \| mipsbe \| mipseb \| mipsel \| mipsle \
	241	\| mips16 \
	242	\| mips64 \| mips64el \
	243	\| mips64vr \| mips64vrel \
	244	\| mips64orion \| mips64orionel \
	245	\| mips64vr4100 \| mips64vr4100el \
	246	\| mips64vr4300 \| mips64vr4300el \
	247	\| mips64vr5000 \| mips64vr5000el \
	248	\| mipsisa32 \| mipsisa32el \
	249	\| mipsisa32r2 \| mipsisa32r2el \
	250	\| mipsisa64 \| mipsisa64el \
	251	\| mipsisa64r2 \| mipsisa64r2el \
	252	\| mipsisa64sb1 \| mipsisa64sb1el \
	253	\| mipsisa64sr71k \| mipsisa64sr71kel \
	254	\| mipstx39 \| mipstx39el \
	255	\| mn10200 \| mn10300 \
	256	\| msp430 \
	257	\| ns16k \| ns32k \
	258	\| openrisc \| or32 \
	259	\| pdp10 \| pdp11 \| pj \| pjl \
	260	\| powerpc \| powerpc64 \| powerpc64le \| powerpcle \| ppcbe \
	261	\| pyramid \
	262	\| sh \| sh[1234] \| sh[23]e \| sh[34]eb \| shbe \| shle \| sh[1234]le \| sh3ele \
	263	\| sh64 \| sh64le \
	264	\| sparc \| sparc64 \| sparc86x \| sparclet \| sparclite \| sparcv8 \| sparcv9 \| sparcv9b \
	265	\| strongarm \
	266	\| tahoe \| thumb \| tic4x \| tic80 \| tron \
	267	\| v850 \| v850e \
	268	\| we32k \
	269	\| x86 \| xscale \| xscalee[bl] \| xstormy16 \| xtensa \
	270	\| z8k)
	271	basic_machine=$basic_machine-unknown
	272	;;
	273	m6811 \| m68hc11 \| m6812 \| m68hc12)
	274	# Motorola 68HC11/12.
	275	basic_machine=$basic_machine-unknown
	276	os=-none
	277	;;
	278	m88110 \| m680[12346]0 \| m683?2 \| m68360 \| m5200 \| v70 \| w65 \| z8k)
	279	;;
	280
	281	# We use `pc' rather than `unknown'
	282	# because (1) that's what they normally are, and
	283	# (2) the word "unknown" tends to confuse beginning users.
	284	i*86 \| x86_64)
	285	basic_machine=$basic_machine-pc
	286	;;
	287	# Object if more than one company name word.
	288	--*)
	289	echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
	290	exit 1
	291	;;
	292	# Recognize the basic CPU types with company name.
	293	580-* \
	294	\| a29k-* \
	295	\| alpha-* \| alphaev[4-8]-* \| alphaev56-* \| alphaev6[78]-* \
	296	\| alpha64-* \| alpha64ev[4-8]-* \| alpha64ev56-* \| alpha64ev6[78]-* \
	297	\| alphapca5[67]-* \| alpha64pca5[67]-* \| arc-* \
	298	\| arm-* \| armbe-* \| armle-* \| armeb-* \| armv- \
	299	\| avr-* \
	300	\| bs2000-* \
	301	\| c[123]* \| c30-* \| [cjt]90-* \| c4x-* \| c54x-* \| c55x-* \| c6x-* \
	302	\| clipper-* \| craynv-* \| cydra-* \
	303	\| d10v-* \| d30v-* \| dlx-* \
	304	\| elxsi-* \
	305	\| f30[01]-* \| f700-* \| fr30-* \| frv-* \| fx80-* \
	306	\| h8300-* \| h8500-* \
	307	\| hppa-* \| hppa1.[01]-* \| hppa2.0-* \| hppa2.0[nw]-* \| hppa64-* \
	308	\| i86- \| i860-* \| i960-* \| ia64-* \
	309	\| ip2k-* \| iq2000-* \
	310	\| m32r-* \| m32rle-* \
	311	\| m68000-* \| m680[012346]0-* \| m68360-* \| m683?2-* \| m68k-* \
	312	\| m88110-* \| m88k-* \| mcore-* \
	313	\| mips-* \| mipsbe-* \| mipseb-* \| mipsel-* \| mipsle-* \
	314	\| mips16-* \
	315	\| mips64-* \| mips64el-* \
	316	\| mips64vr-* \| mips64vrel-* \
	317	\| mips64orion-* \| mips64orionel-* \
	318	\| mips64vr4100-* \| mips64vr4100el-* \
	319	\| mips64vr4300-* \| mips64vr4300el-* \
	320	\| mips64vr5000-* \| mips64vr5000el-* \
	321	\| mipsisa32-* \| mipsisa32el-* \
	322	\| mipsisa32r2-* \| mipsisa32r2el-* \
	323	\| mipsisa64-* \| mipsisa64el-* \
	324	\| mipsisa64r2-* \| mipsisa64r2el-* \
	325	\| mipsisa64sb1-* \| mipsisa64sb1el-* \
	326	\| mipsisa64sr71k-* \| mipsisa64sr71kel-* \
	327	\| mipstx39-* \| mipstx39el-* \
	328	\| mmix-* \
	329	\| msp430-* \
	330	\| none-* \| np1-* \| ns16k-* \| ns32k-* \
	331	\| orion-* \
	332	\| pdp10-* \| pdp11-* \| pj-* \| pjl-* \| pn-* \| power-* \
	333	\| powerpc-* \| powerpc64-* \| powerpc64le-* \| powerpcle-* \| ppcbe-* \
	334	\| pyramid-* \
	335	\| romp-* \| rs6000-* \
	336	\| sh-* \| sh[1234]-* \| sh[23]e-* \| sh[34]eb-* \| shbe-* \
	337	\| shle-* \| sh[1234]le-* \| sh3ele-* \| sh64-* \| sh64le-* \
	338	\| sparc-* \| sparc64-* \| sparc86x-* \| sparclet-* \| sparclite-* \
	339	\| sparcv8-* \| sparcv9-* \| sparcv9b-* \| strongarm-* \| sv1-* \| sx?-* \
	340	\| tahoe-* \| thumb-* \
	341	\| tic30-* \| tic4x-* \| tic54x-* \| tic55x-* \| tic6x-* \| tic80-* \
	342	\| tron-* \
	343	\| v850-* \| v850e-* \| vax-* \
	344	\| we32k-* \
	345	\| x86-* \| x86_64-* \| xps100-* \| xscale-* \| xscalee[bl]-* \
	346	\| xstormy16-* \| xtensa-* \
	347	\| ymp-* \
	348	\| z8k-*)
	349	;;
	350	# Recognize the various machine names and aliases which stand
	351	# for a CPU type and a company and sometimes even an OS.
	352	386bsd)
	353	basic_machine=i386-unknown
	354	os=-bsd
	355	;;
	356	3b1 \| 7300 \| 7300-att \| att-7300 \| pc7300 \| safari \| unixpc)
	357	basic_machine=m68000-att
	358	;;
	359	3b*)
	360	basic_machine=we32k-att
	361	;;
	362	a29khif)
	363	basic_machine=a29k-amd
	364	os=-udi
	365	;;
	366	abacus)
	367	basic_machine=abacus-unknown
	368	;;
	369	adobe68k)
	370	basic_machine=m68010-adobe
	371	os=-scout
	372	;;
	373	alliant \| fx80)
	374	basic_machine=fx80-alliant
	375	;;
	376	altos \| altos3068)
	377	basic_machine=m68k-altos
	378	;;
	379	am29k)
	380	basic_machine=a29k-none
	381	os=-bsd
	382	;;
	383	amd64)
	384	basic_machine=x86_64-pc
	385	;;
	386	amd64-*)
	387	basic_machine=x86_64-`echo $basic_machine \| sed 's/^[^-]*-//'`
	388	;;
	389	amdahl)
	390	basic_machine=580-amdahl
	391	os=-sysv
	392	;;
	393	amiga \| amiga-*)
	394	basic_machine=m68k-unknown
	395	;;
	396	amigaos \| amigados)
	397	basic_machine=m68k-unknown
	398	os=-amigaos
	399	;;
	400	amigaunix \| amix)
	401	basic_machine=m68k-unknown
	402	os=-sysv4
	403	;;
	404	apollo68)
	405	basic_machine=m68k-apollo
	406	os=-sysv
	407	;;
	408	apollo68bsd)
	409	basic_machine=m68k-apollo
	410	os=-bsd
	411	;;
	412	aux)
	413	basic_machine=m68k-apple
	414	os=-aux
	415	;;
	416	balance)
	417	basic_machine=ns32k-sequent
	418	os=-dynix
	419	;;
	420	c90)
	421	basic_machine=c90-cray
	422	os=-unicos
	423	;;
	424	convex-c1)
	425	basic_machine=c1-convex
	426	os=-bsd
	427	;;
	428	convex-c2)
	429	basic_machine=c2-convex
	430	os=-bsd
	431	;;
	432	convex-c32)
	433	basic_machine=c32-convex
	434	os=-bsd
	435	;;
	436	convex-c34)
	437	basic_machine=c34-convex
	438	os=-bsd
	439	;;
	440	convex-c38)
	441	basic_machine=c38-convex
	442	os=-bsd
	443	;;
	444	cray \| j90)
	445	basic_machine=j90-cray
	446	os=-unicos
	447	;;
	448	craynv)
	449	basic_machine=craynv-cray
	450	os=-unicosmp
	451	;;
	452	cr16c)
	453	basic_machine=cr16c-unknown
	454	os=-elf
	455	;;
	456	crds \| unos)
	457	basic_machine=m68k-crds
	458	;;
	459	crisv32 \| crisv32-* \| etraxfs*)
	460	basic_machine=crisv32-axis
	461	;;
	462	cris \| cris-* \| etrax*)
	463	basic_machine=cris-axis
	464	;;
	465	crx)
	466	basic_machine=crx-unknown
	467	os=-elf
	468	;;
	469	da30 \| da30-*)
	470	basic_machine=m68k-da30
	471	;;
	472	decstation \| decstation-3100 \| pmax \| pmax-* \| pmin \| dec3100 \| decstatn)
	473	basic_machine=mips-dec
	474	;;
	475	decsystem10* \| dec10*)
	476	basic_machine=pdp10-dec
	477	os=-tops10
	478	;;
	479	decsystem20* \| dec20*)
	480	basic_machine=pdp10-dec
	481	os=-tops20
	482	;;
	483	delta \| 3300 \| motorola-3300 \| motorola-delta \
	484	\| 3300-motorola \| delta-motorola)
	485	basic_machine=m68k-motorola
	486	;;
	487	delta88)
	488	basic_machine=m88k-motorola
	489	os=-sysv3
	490	;;
	491	djgpp)
	492	basic_machine=i586-pc
	493	os=-msdosdjgpp
	494	;;
	495	dpx20 \| dpx20-*)
	496	basic_machine=rs6000-bull
	497	os=-bosx
	498	;;
	499	dpx2* \| dpx2*-bull)
	500	basic_machine=m68k-bull
	501	os=-sysv3
	502	;;
	503	ebmon29k)
	504	basic_machine=a29k-amd
	505	os=-ebmon
	506	;;
	507	elxsi)
	508	basic_machine=elxsi-elxsi
	509	os=-bsd
	510	;;
	511	encore \| umax \| mmax)
	512	basic_machine=ns32k-encore
	513	;;
	514	es1800 \| OSE68k \| ose68k \| ose \| OSE)
	515	basic_machine=m68k-ericsson
	516	os=-ose
	517	;;
	518	fx2800)
	519	basic_machine=i860-alliant
	520	;;
	521	genix)
	522	basic_machine=ns32k-ns
	523	;;
	524	gmicro)
	525	basic_machine=tron-gmicro
	526	os=-sysv
	527	;;
	528	go32)
	529	basic_machine=i386-pc
	530	os=-go32
	531	;;
	532	h3050r* \| hiux*)
	533	basic_machine=hppa1.1-hitachi
	534	os=-hiuxwe2
	535	;;
	536	h8300hms)
	537	basic_machine=h8300-hitachi
	538	os=-hms
	539	;;
	540	h8300xray)
	541	basic_machine=h8300-hitachi
	542	os=-xray
	543	;;
	544	h8500hms)
	545	basic_machine=h8500-hitachi
	546	os=-hms
	547	;;
	548	harris)
	549	basic_machine=m88k-harris
	550	os=-sysv3
	551	;;
	552	hp300-*)
	553	basic_machine=m68k-hp
	554	;;
	555	hp300bsd)
	556	basic_machine=m68k-hp
	557	os=-bsd
	558	;;
	559	hp300hpux)
	560	basic_machine=m68k-hp
	561	os=-hpux
	562	;;
	563	hp3k9[0-9][0-9] \| hp9[0-9][0-9])
	564	basic_machine=hppa1.0-hp
	565	;;
	566	hp9k2[0-9][0-9] \| hp9k31[0-9])
	567	basic_machine=m68000-hp
	568	;;
	569	hp9k3[2-9][0-9])
	570	basic_machine=m68k-hp
	571	;;
	572	hp9k6[0-9][0-9] \| hp6[0-9][0-9])
	573	basic_machine=hppa1.0-hp
	574	;;
	575	hp9k7[0-79][0-9] \| hp7[0-79][0-9])
	576	basic_machine=hppa1.1-hp
	577	;;
	578	hp9k78[0-9] \| hp78[0-9])
	579	# FIXME: really hppa2.0-hp
	580	basic_machine=hppa1.1-hp
	581	;;
	582	hp9k8[67]1 \| hp8[67]1 \| hp9k80[24] \| hp80[24] \| hp9k8[78]9 \| hp8[78]9 \| hp9k893 \| hp893)
	583	# FIXME: really hppa2.0-hp
	584	basic_machine=hppa1.1-hp
	585	;;
	586	hp9k8[0-9][13679] \| hp8[0-9][13679])
	587	basic_machine=hppa1.1-hp
	588	;;
	589	hp9k8[0-9][0-9] \| hp8[0-9][0-9])
	590	basic_machine=hppa1.0-hp
	591	;;
	592	hppa-next)
	593	os=-nextstep3
	594	;;
	595	hppaosf)
	596	basic_machine=hppa1.1-hp
	597	os=-osf
	598	;;
	599	hppro)
	600	basic_machine=hppa1.1-hp
	601	os=-proelf
	602	;;
	603	i370-ibm* \| ibm*)
	604	basic_machine=i370-ibm
	605	;;
	606	# I'm not sure what "Sysv32" means. Should this be sysv3.2?
	607	i*86v32)
	608	basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`
	609	os=-sysv32
	610	;;
	611	i86v4)
	612	basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`
	613	os=-sysv4
	614	;;
	615	i*86v)
	616	basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`
	617	os=-sysv
	618	;;
	619	i*86sol2)
	620	basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`
	621	os=-solaris2
	622	;;
	623	i386mach)
	624	basic_machine=i386-mach
	625	os=-mach
	626	;;
	627	i386-vsta \| vsta)
	628	basic_machine=i386-unknown
	629	os=-vsta
	630	;;
	631	iris \| iris4d)
	632	basic_machine=mips-sgi
	633	case $os in
	634	-irix*)
	635	;;
	636	*)
	637	os=-irix4
	638	;;
	639	esac
	640	;;
	641	isi68 \| isi)
	642	basic_machine=m68k-isi
	643	os=-sysv
	644	;;
	645	m88k-omron*)
	646	basic_machine=m88k-omron
	647	;;
	648	magnum \| m3230)
	649	basic_machine=mips-mips
	650	os=-sysv
	651	;;
	652	merlin)
	653	basic_machine=ns32k-utek
	654	os=-sysv
	655	;;
	656	mingw32)
	657	basic_machine=i386-pc
	658	os=-mingw32
	659	;;
	660	miniframe)
	661	basic_machine=m68000-convergent
	662	;;
	663	mint \| -mint[0-9] \| MiNT \| MiNT[0-9]*)
	664	basic_machine=m68k-atari
	665	os=-mint
	666	;;
	667	mips3-)
	668	basic_machine=`echo $basic_machine \| sed -e 's/mips3/mips64/'`
	669	;;
	670	mips3*)
	671	basic_machine=`echo $basic_machine \| sed -e 's/mips3/mips64/'`-unknown
	672	;;
	673	monitor)
	674	basic_machine=m68k-rom68k
	675	os=-coff
	676	;;
	677	morphos)
	678	basic_machine=powerpc-unknown
	679	os=-morphos
	680	;;
	681	msdos)
	682	basic_machine=i386-pc
	683	os=-msdos
	684	;;
	685	mvs)
	686	basic_machine=i370-ibm
	687	os=-mvs
	688	;;
	689	ncr3000)
	690	basic_machine=i486-ncr
	691	os=-sysv4
	692	;;
	693	netbsd386)
	694	basic_machine=i386-unknown
	695	os=-netbsd
	696	;;
	697	netwinder)
	698	basic_machine=armv4l-rebel
	699	os=-linux
	700	;;
	701	news \| news700 \| news800 \| news900)
	702	basic_machine=m68k-sony
	703	os=-newsos
	704	;;
	705	news1000)
	706	basic_machine=m68030-sony
	707	os=-newsos
	708	;;
	709	news-3600 \| risc-news)
	710	basic_machine=mips-sony
	711	os=-newsos
	712	;;
	713	necv70)
	714	basic_machine=v70-nec
	715	os=-sysv
	716	;;
	717	next \| m*-next )
	718	basic_machine=m68k-next
	719	case $os in
	720	-nextstep* )
	721	;;
	722	-ns2*)
	723	os=-nextstep2
	724	;;
	725	*)
	726	os=-nextstep3
	727	;;
	728	esac
	729	;;
	730	nh3000)
	731	basic_machine=m68k-harris
	732	os=-cxux
	733	;;
	734	nh[45]000)
	735	basic_machine=m88k-harris
	736	os=-cxux
	737	;;
	738	nindy960)
	739	basic_machine=i960-intel
	740	os=-nindy
	741	;;
	742	mon960)
	743	basic_machine=i960-intel
	744	os=-mon960
	745	;;
	746	nonstopux)
	747	basic_machine=mips-compaq
	748	os=-nonstopux
	749	;;
	750	np1)
	751	basic_machine=np1-gould
	752	;;
	753	nsr-tandem)
	754	basic_machine=nsr-tandem
	755	;;
	756	op50n-* \| op60c-*)
	757	basic_machine=hppa1.1-oki
	758	os=-proelf
	759	;;
	760	or32 \| or32-*)
	761	basic_machine=or32-unknown
	762	os=-coff
	763	;;
	764	os400)
	765	basic_machine=powerpc-ibm
	766	os=-os400
	767	;;
	768	OSE68000 \| ose68000)
	769	basic_machine=m68000-ericsson
	770	os=-ose
	771	;;
	772	os68k)
	773	basic_machine=m68k-none
	774	os=-os68k
	775	;;
	776	pa-hitachi)
	777	basic_machine=hppa1.1-hitachi
	778	os=-hiuxwe2
	779	;;
	780	paragon)
	781	basic_machine=i860-intel
	782	os=-osf
	783	;;
	784	pbd)
	785	basic_machine=sparc-tti
	786	;;
	787	pbb)
	788	basic_machine=m68k-tti
	789	;;
	790	pc532 \| pc532-*)
	791	basic_machine=ns32k-pc532
	792	;;
	793	pentium \| p5 \| k5 \| k6 \| nexgen \| viac3)
	794	basic_machine=i586-pc
	795	;;
	796	pentiumpro \| p6 \| 6x86 \| athlon \| athlon_*)
	797	basic_machine=i686-pc
	798	;;
	799	pentiumii \| pentium2 \| pentiumiii \| pentium3)
	800	basic_machine=i686-pc
	801	;;
	802	pentium4)
	803	basic_machine=i786-pc
	804	;;
	805	pentium-* \| p5-* \| k5-* \| k6-* \| nexgen-* \| viac3-*)
	806	basic_machine=i586-`echo $basic_machine \| sed 's/^[^-]*-//'`
	807	;;
	808	pentiumpro-* \| p6-* \| 6x86-* \| athlon-*)
	809	basic_machine=i686-`echo $basic_machine \| sed 's/^[^-]*-//'`
	810	;;
	811	pentiumii-* \| pentium2-* \| pentiumiii-* \| pentium3-*)
	812	basic_machine=i686-`echo $basic_machine \| sed 's/^[^-]*-//'`
	813	;;
	814	pentium4-*)
	815	basic_machine=i786-`echo $basic_machine \| sed 's/^[^-]*-//'`
	816	;;
	817	pn)
	818	basic_machine=pn-gould
	819	;;
	820	power) basic_machine=power-ibm
	821	;;
	822	ppc) basic_machine=powerpc-unknown
	823	;;
	824	ppc-) basic_machine=powerpc-`echo $basic_machine \| sed 's/^[^-]-//'`
	825	;;
	826	ppcle \| powerpclittle \| ppc-le \| powerpc-little)
	827	basic_machine=powerpcle-unknown
	828	;;
	829	ppcle-* \| powerpclittle-*)
	830	basic_machine=powerpcle-`echo $basic_machine \| sed 's/^[^-]*-//'`
	831	;;
	832	ppc64) basic_machine=powerpc64-unknown
	833	;;
	834	ppc64-) basic_machine=powerpc64-`echo $basic_machine \| sed 's/^[^-]-//'`
	835	;;
	836	ppc64le \| powerpc64little \| ppc64-le \| powerpc64-little)
	837	basic_machine=powerpc64le-unknown
	838	;;
	839	ppc64le-* \| powerpc64little-*)
	840	basic_machine=powerpc64le-`echo $basic_machine \| sed 's/^[^-]*-//'`
	841	;;
	842	ps2)
	843	basic_machine=i386-ibm
	844	;;
	845	pw32)
	846	basic_machine=i586-unknown
	847	os=-pw32
	848	;;
	849	rom68k)
	850	basic_machine=m68k-rom68k
	851	os=-coff
	852	;;
	853	rm[46]00)
	854	basic_machine=mips-siemens
	855	;;
	856	rtpc \| rtpc-*)
	857	basic_machine=romp-ibm
	858	;;
	859	s390 \| s390-*)
	860	basic_machine=s390-ibm
	861	;;
	862	s390x \| s390x-*)
	863	basic_machine=s390x-ibm
	864	;;
	865	sa29200)
	866	basic_machine=a29k-amd
	867	os=-udi
	868	;;
	869	sb1)
	870	basic_machine=mipsisa64sb1-unknown
	871	;;
	872	sb1el)
	873	basic_machine=mipsisa64sb1el-unknown
	874	;;
	875	sei)
	876	basic_machine=mips-sei
	877	os=-seiux
	878	;;
	879	sequent)
	880	basic_machine=i386-sequent
	881	;;
	882	sh)
	883	basic_machine=sh-hitachi
	884	os=-hms
	885	;;
	886	sh64)
	887	basic_machine=sh64-unknown
	888	;;
	889	sparclite-wrs \| simso-wrs)
	890	basic_machine=sparclite-wrs
	891	os=-vxworks
	892	;;
	893	sps7)
	894	basic_machine=m68k-bull
	895	os=-sysv2
	896	;;
	897	spur)
	898	basic_machine=spur-unknown
	899	;;
	900	st2000)
	901	basic_machine=m68k-tandem
	902	;;
	903	stratus)
	904	basic_machine=i860-stratus
	905	os=-sysv4
	906	;;
	907	sun2)
	908	basic_machine=m68000-sun
	909	;;
	910	sun2os3)
	911	basic_machine=m68000-sun
	912	os=-sunos3
	913	;;
	914	sun2os4)
	915	basic_machine=m68000-sun
	916	os=-sunos4
	917	;;
	918	sun3os3)
	919	basic_machine=m68k-sun
	920	os=-sunos3
	921	;;
	922	sun3os4)
	923	basic_machine=m68k-sun
	924	os=-sunos4
	925	;;
	926	sun4os3)
	927	basic_machine=sparc-sun
	928	os=-sunos3
	929	;;
	930	sun4os4)
	931	basic_machine=sparc-sun
	932	os=-sunos4
	933	;;
	934	sun4sol2)
	935	basic_machine=sparc-sun
	936	os=-solaris2
	937	;;
	938	sun3 \| sun3-*)
	939	basic_machine=m68k-sun
	940	;;
	941	sun4)
	942	basic_machine=sparc-sun
	943	;;
	944	sun386 \| sun386i \| roadrunner)
	945	basic_machine=i386-sun
	946	;;
	947	sv1)
	948	basic_machine=sv1-cray
	949	os=-unicos
	950	;;
	951	symmetry)
	952	basic_machine=i386-sequent
	953	os=-dynix
	954	;;
	955	t3e)
	956	basic_machine=alphaev5-cray
	957	os=-unicos
	958	;;
	959	t90)
	960	basic_machine=t90-cray
	961	os=-unicos
	962	;;
	963	tic54x \| c54x*)
	964	basic_machine=tic54x-unknown
	965	os=-coff
	966	;;
	967	tic55x \| c55x*)
	968	basic_machine=tic55x-unknown
	969	os=-coff
	970	;;
	971	tic6x \| c6x*)
	972	basic_machine=tic6x-unknown
	973	os=-coff
	974	;;
	975	tx39)
	976	basic_machine=mipstx39-unknown
	977	;;
	978	tx39el)
	979	basic_machine=mipstx39el-unknown
	980	;;
	981	toad1)
	982	basic_machine=pdp10-xkl
	983	os=-tops20
	984	;;
	985	tower \| tower-32)
	986	basic_machine=m68k-ncr
	987	;;
	988	tpf)
	989	basic_machine=s390x-ibm
	990	os=-tpf
	991	;;
	992	udi29k)
	993	basic_machine=a29k-amd
	994	os=-udi
	995	;;
	996	ultra3)
	997	basic_machine=a29k-nyu
	998	os=-sym1
	999	;;
	1000	v810 \| necv810)
	1001	basic_machine=v810-nec
	1002	os=-none
	1003	;;
	1004	vaxv)
	1005	basic_machine=vax-dec
	1006	os=-sysv
	1007	;;
	1008	vms)
	1009	basic_machine=vax-dec
	1010	os=-vms
	1011	;;
	1012	vpp\|vx\|vx-)
	1013	basic_machine=f301-fujitsu
	1014	;;
	1015	vxworks960)
	1016	basic_machine=i960-wrs
	1017	os=-vxworks
	1018	;;
	1019	vxworks68)
	1020	basic_machine=m68k-wrs
	1021	os=-vxworks
	1022	;;
	1023	vxworks29k)
	1024	basic_machine=a29k-wrs
	1025	os=-vxworks
	1026	;;
	1027	w65*)
	1028	basic_machine=w65-wdc
	1029	os=-none
	1030	;;
	1031	w89k-*)
	1032	basic_machine=hppa1.1-winbond
	1033	os=-proelf
	1034	;;
	1035	xbox)
	1036	basic_machine=i686-pc
	1037	os=-mingw32
	1038	;;
	1039	xps \| xps100)
	1040	basic_machine=xps100-honeywell
	1041	;;
	1042	ymp)
	1043	basic_machine=ymp-cray
	1044	os=-unicos
	1045	;;
	1046	z8k-*-coff)
	1047	basic_machine=z8k-unknown
	1048	os=-sim
	1049	;;
	1050	none)
	1051	basic_machine=none-none
	1052	os=-none
	1053	;;
	1054
	1055	# Here we handle the default manufacturer of certain CPU types. It is in
	1056	# some cases the only manufacturer, in others, it is the most popular.
	1057	w89k)
	1058	basic_machine=hppa1.1-winbond
	1059	;;
	1060	op50n)
	1061	basic_machine=hppa1.1-oki
	1062	;;
	1063	op60c)
	1064	basic_machine=hppa1.1-oki
	1065	;;
	1066	romp)
	1067	basic_machine=romp-ibm
	1068	;;
	1069	mmix)
	1070	basic_machine=mmix-knuth
	1071	;;
	1072	rs6000)
	1073	basic_machine=rs6000-ibm
	1074	;;
	1075	vax)
	1076	basic_machine=vax-dec
	1077	;;
	1078	pdp10)
	1079	# there are many clones, so DEC is not a safe bet
	1080	basic_machine=pdp10-unknown
	1081	;;
	1082	pdp11)
	1083	basic_machine=pdp11-dec
	1084	;;
	1085	we32k)
	1086	basic_machine=we32k-att
	1087	;;
	1088	sh3 \| sh4 \| sh[34]eb \| sh[1234]le \| sh[23]ele)
	1089	basic_machine=sh-unknown
	1090	;;
	1091	sh64)
	1092	basic_machine=sh64-unknown
	1093	;;
	1094	sparc \| sparcv8 \| sparcv9 \| sparcv9b)
	1095	basic_machine=sparc-sun
	1096	;;
	1097	cydra)
	1098	basic_machine=cydra-cydrome
	1099	;;
	1100	orion)
	1101	basic_machine=orion-highlevel
	1102	;;
	1103	orion105)
	1104	basic_machine=clipper-highlevel
	1105	;;
	1106	mac \| mpw \| mac-mpw)
	1107	basic_machine=m68k-apple
	1108	;;
	1109	pmac \| pmac-mpw)
	1110	basic_machine=powerpc-apple
	1111	;;
	1112	*-unknown)
	1113	# Make sure to match an already-canonicalized machine name.
	1114	;;
	1115	*)
	1116	echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
	1117	exit 1
	1118	;;
	1119	esac
	1120
	1121	# Here we canonicalize certain aliases for manufacturers.
	1122	case $basic_machine in
	1123	-digital)
	1124	basic_machine=`echo $basic_machine \| sed 's/digital.*/dec/'`
	1125	;;
	1126	-commodore)
	1127	basic_machine=`echo $basic_machine \| sed 's/commodore.*/cbm/'`
	1128	;;
	1129	*)
	1130	;;
	1131	esac
	1132
	1133	# Decode manufacturer-specific aliases for certain operating systems.
	1134
	1135	if [ x"$os" != x"" ]
	1136	then
	1137	case $os in
	1138	# First match some system type aliases
	1139	# that might get confused with valid system types.
	1140	# -solaris* is a basic system type, with this one exception.
	1141	-solaris1 \| -solaris1.*)
	1142	os=`echo $os \| sed -e 's\|solaris1\|sunos4\|'`
	1143	;;
	1144	-solaris)
	1145	os=-solaris2
	1146	;;
	1147	-svr4*)
	1148	os=-sysv4
	1149	;;
	1150	-unixware*)
	1151	os=-sysv4.2uw
	1152	;;
	1153	-gnu/linux*)
	1154	os=`echo $os \| sed -e 's\|gnu/linux\|linux-gnu\|'`
	1155	;;
	1156	# First accept the basic system types.
	1157	# The portable systems comes first.
	1158	# Each alternative MUST END IN A *, to match a version number.
	1159	# -sysv* is not here because it comes later, after sysvr4.
	1160	-gnu* \| -bsd* \| -mach* \| -minix* \| -genix* \| -ultrix* \| -irix* \
	1161	\| -vms \| -sco* \| -esix* \| -isc* \| -aix* \| -sunos \| -sunos[34]*\
	1162	\| -hpux* \| -unos* \| -osf* \| -luna* \| -dgux* \| -solaris* \| -sym* \
	1163	\| -amigaos* \| -amigados* \| -msdos* \| -newsos* \| -unicos* \| -aof* \
	1164	\| -aos* \
	1165	\| -nindy* \| -vxsim* \| -vxworks* \| -ebmon* \| -hms* \| -mvs* \
	1166	\| -clix* \| -riscos* \| -uniplus* \| -iris* \| -rtu* \| -xenix* \
	1167	\| -hiux* \| -386bsd* \| -knetbsd* \| -mirbsd* \| -netbsd* \| -openbsd* \
	1168	\| -ekkobsd* \| -kfreebsd* \| -freebsd* \| -riscix* \| -lynxos* \
	1169	\| -bosx* \| -nextstep* \| -cxux* \| -aout* \| -elf* \| -oabi* \
	1170	\| -ptx* \| -coff* \| -ecoff* \| -winnt* \| -domain* \| -vsta* \
	1171	\| -udi* \| -eabi* \| -lites* \| -ieee* \| -go32* \| -aux* \
	1172	\| -chorusos* \| -chorusrdb* \
	1173	\| -cygwin* \| -pe* \| -psos* \| -moss* \| -proelf* \| -rtems* \
	1174	\| -mingw32* \| -linux-gnu* \| -linux-uclibc* \| -uxpv* \| -beos* \| -mpeix* \| -udk* \
	1175	\| -interix* \| -uwin* \| -mks* \| -rhapsody* \| -darwin* \| -opened* \
	1176	\| -openstep* \| -oskit* \| -conix* \| -pw32* \| -nonstopux* \
	1177	\| -storm-chaos* \| -tops10* \| -tenex* \| -tops20* \| -its* \
	1178	\| -os2* \| -vos* \| -palmos* \| -uclinux* \| -nucleus* \
	1179	\| -morphos* \| -superux* \| -rtmk* \| -rtmk-nova* \| -windiss* \
	1180	\| -powermax* \| -dnix* \| -nx6 \| -nx7 \| -sei* \| -dragonfly*)
	1181	# Remember, each alternative MUST END IN *, to match a version number.
	1182	;;
	1183	-qnx*)
	1184	case $basic_machine in
	1185	x86-* \| i86-)
	1186	;;
	1187	*)
	1188	os=-nto$os
	1189	;;
	1190	esac
	1191	;;
	1192	-nto-qnx*)
	1193	;;
	1194	-nto*)
	1195	os=`echo $os \| sed -e 's\|nto\|nto-qnx\|'`
	1196	;;
	1197	-sim \| -es1800* \| -hms* \| -xray \| -os68k* \| -none* \| -v88r* \
	1198	\| -windows* \| -osx \| -abug \| -netware* \| -os9* \| -beos* \
	1199	\| -macos* \| -mpw* \| -magic* \| -mmixware* \| -mon960* \| -lnews*)
	1200	;;
	1201	-mac*)
	1202	os=`echo $os \| sed -e 's\|mac\|macos\|'`
	1203	;;
	1204	-linux-dietlibc)
	1205	os=-linux-dietlibc
	1206	;;
	1207	-linux*)
	1208	os=`echo $os \| sed -e 's\|linux\|linux-gnu\|'`
	1209	;;
	1210	-sunos5*)
	1211	os=`echo $os \| sed -e 's\|sunos5\|solaris2\|'`
	1212	;;
	1213	-sunos6*)
	1214	os=`echo $os \| sed -e 's\|sunos6\|solaris3\|'`
	1215	;;
	1216	-opened*)
	1217	os=-openedition
	1218	;;
	1219	-os400*)
	1220	os=-os400
	1221	;;
	1222	-wince*)
	1223	os=-wince
	1224	;;
	1225	-osfrose*)
	1226	os=-osfrose
	1227	;;
	1228	-osf*)
	1229	os=-osf
	1230	;;
	1231	-utek*)
	1232	os=-bsd
	1233	;;
	1234	-dynix*)
	1235	os=-bsd
	1236	;;
	1237	-acis*)
	1238	os=-aos
	1239	;;
	1240	-atheos*)
	1241	os=-atheos
	1242	;;
	1243	-syllable*)
	1244	os=-syllable
	1245	;;
	1246	-386bsd)
	1247	os=-bsd
	1248	;;
	1249	-ctix* \| -uts*)
	1250	os=-sysv
	1251	;;
	1252	-nova*)
	1253	os=-rtmk-nova
	1254	;;
	1255	-ns2 )
	1256	os=-nextstep2
	1257	;;
	1258	-nsk*)
	1259	os=-nsk
	1260	;;
	1261	# Preserve the version number of sinix5.
	1262	-sinix5.*)
	1263	os=`echo $os \| sed -e 's\|sinix\|sysv\|'`
	1264	;;
	1265	-sinix*)
	1266	os=-sysv4
	1267	;;
	1268	-tpf*)
	1269	os=-tpf
	1270	;;
	1271	-triton*)
	1272	os=-sysv3
	1273	;;
	1274	-oss*)
	1275	os=-sysv3
	1276	;;
	1277	-svr4)
	1278	os=-sysv4
	1279	;;
	1280	-svr3)
	1281	os=-sysv3
	1282	;;
	1283	-sysvr4)
	1284	os=-sysv4
	1285	;;
	1286	# This must come after -sysvr4.
	1287	-sysv*)
	1288	;;
	1289	-ose*)
	1290	os=-ose
	1291	;;
	1292	-es1800*)
	1293	os=-ose
	1294	;;
	1295	-xenix)
	1296	os=-xenix
	1297	;;
	1298	-mint \| -mint[0-9] \| -MiNT \| -MiNT[0-9])
	1299	os=-mint
	1300	;;
	1301	-aros*)
	1302	os=-aros
	1303	;;
	1304	-kaos*)
	1305	os=-kaos
	1306	;;
	1307	-zvmoe)
	1308	os=-zvmoe
	1309	;;
	1310	-none)
	1311	;;
	1312	*)
	1313	# Get rid of the `-' at the beginning of $os.
	1314	os=`echo $os \| sed 's/[^-]*-//'`
	1315	echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
	1316	exit 1
	1317	;;
	1318	esac
	1319	else
	1320
	1321	# Here we handle the default operating systems that come with various machines.
	1322	# The value should be what the vendor currently ships out the door with their
	1323	# machine or put another way, the most popular os provided with the machine.
	1324
	1325	# Note that if you're going to try to match "-MANUFACTURER" here (say,
	1326	# "-sun"), then you have to tell the case statement up towards the top
	1327	# that MANUFACTURER isn't an operating system. Otherwise, code above
	1328	# will signal an error saying that MANUFACTURER isn't an operating
	1329	# system, and we'll never get to this point.
	1330
	1331	case $basic_machine in
	1332	*-acorn)
	1333	os=-riscix1.2
	1334	;;
	1335	arm*-rebel)
	1336	os=-linux
	1337	;;
	1338	arm*-semi)
	1339	os=-aout
	1340	;;
	1341	c4x-* \| tic4x-*)
	1342	os=-coff
	1343	;;
	1344	# This must come before the *-dec entry.
	1345	pdp10-*)
	1346	os=-tops20
	1347	;;
	1348	pdp11-*)
	1349	os=-none
	1350	;;
	1351	-dec \| vax-)
	1352	os=-ultrix4.2
	1353	;;
	1354	m68*-apollo)
	1355	os=-domain
	1356	;;
	1357	i386-sun)
	1358	os=-sunos4.0.2
	1359	;;
	1360	m68000-sun)
	1361	os=-sunos3
	1362	# This also exists in the configure program, but was not the
	1363	# default.
	1364	# os=-sunos4
	1365	;;
	1366	m68*-cisco)
	1367	os=-aout
	1368	;;
	1369	mips*-cisco)
	1370	os=-elf
	1371	;;
	1372	mips-)
	1373	os=-elf
	1374	;;
	1375	or32-*)
	1376	os=-coff
	1377	;;
	1378	*-tti) # must be before sparc entry or we get the wrong os.
	1379	os=-sysv3
	1380	;;
	1381	sparc-* \| *-sun)
	1382	os=-sunos4.1.1
	1383	;;
	1384	*-be)
	1385	os=-beos
	1386	;;
	1387	*-ibm)
	1388	os=-aix
	1389	;;
	1390	*-knuth)
	1391	os=-mmixware
	1392	;;
	1393	*-wec)
	1394	os=-proelf
	1395	;;
	1396	*-winbond)
	1397	os=-proelf
	1398	;;
	1399	*-oki)
	1400	os=-proelf
	1401	;;
	1402	*-hp)
	1403	os=-hpux
	1404	;;
	1405	*-hitachi)
	1406	os=-hiux
	1407	;;
	1408	i860-* \| -att \| -ncr \| -altos \| -motorola \| *-convergent)
	1409	os=-sysv
	1410	;;
	1411	*-cbm)
	1412	os=-amigaos
	1413	;;
	1414	*-dg)
	1415	os=-dgux
	1416	;;
	1417	*-dolphin)
	1418	os=-sysv3
	1419	;;
	1420	m68k-ccur)
	1421	os=-rtu
	1422	;;
	1423	m88k-omron*)
	1424	os=-luna
	1425	;;
	1426	*-next )
	1427	os=-nextstep
	1428	;;
	1429	*-sequent)
	1430	os=-ptx
	1431	;;
	1432	*-crds)
	1433	os=-unos
	1434	;;
	1435	*-ns)
	1436	os=-genix
	1437	;;
	1438	i370-*)
	1439	os=-mvs
	1440	;;
	1441	*-next)
	1442	os=-nextstep3
	1443	;;
	1444	*-gould)
	1445	os=-sysv
	1446	;;
	1447	*-highlevel)
	1448	os=-bsd
	1449	;;
	1450	*-encore)
	1451	os=-bsd
	1452	;;
	1453	*-sgi)
	1454	os=-irix
	1455	;;
	1456	*-siemens)
	1457	os=-sysv4
	1458	;;
	1459	*-masscomp)
	1460	os=-rtu
	1461	;;
	1462	f30[01]-fujitsu \| f700-fujitsu)
	1463	os=-uxpv
	1464	;;
	1465	*-rom68k)
	1466	os=-coff
	1467	;;
	1468	-bug)
	1469	os=-coff
	1470	;;
	1471	*-apple)
	1472	os=-macos
	1473	;;
	1474	-atari)
	1475	os=-mint
	1476	;;
	1477	*)
	1478	os=-none
	1479	;;
	1480	esac
	1481	fi
	1482
	1483	# Here we handle the case where we know the os, and the CPU type, but not the
	1484	# manufacturer. We pick the logical manufacturer.
	1485	vendor=unknown
	1486	case $basic_machine in
	1487	*-unknown)
	1488	case $os in
	1489	-riscix*)
	1490	vendor=acorn
	1491	;;
	1492	-sunos*)
	1493	vendor=sun
	1494	;;
	1495	-aix*)
	1496	vendor=ibm
	1497	;;
	1498	-beos*)
	1499	vendor=be
	1500	;;
	1501	-hpux*)
	1502	vendor=hp
	1503	;;
	1504	-mpeix*)
	1505	vendor=hp
	1506	;;
	1507	-hiux*)
	1508	vendor=hitachi
	1509	;;
	1510	-unos*)
	1511	vendor=crds
	1512	;;
	1513	-dgux*)
	1514	vendor=dg
	1515	;;
	1516	-luna*)
	1517	vendor=omron
	1518	;;
	1519	-genix*)
	1520	vendor=ns
	1521	;;
	1522	-mvs* \| -opened*)
	1523	vendor=ibm
	1524	;;
	1525	-os400*)
	1526	vendor=ibm
	1527	;;
	1528	-ptx*)
	1529	vendor=sequent
	1530	;;
	1531	-tpf*)
	1532	vendor=ibm
	1533	;;
	1534	-vxsim* \| -vxworks* \| -windiss*)
	1535	vendor=wrs
	1536	;;
	1537	-aux*)
	1538	vendor=apple
	1539	;;
	1540	-hms*)
	1541	vendor=hitachi
	1542	;;
	1543	-mpw* \| -macos*)
	1544	vendor=apple
	1545	;;
	1546	-mint \| -mint[0-9] \| -MiNT \| -MiNT[0-9])
	1547	vendor=atari
	1548	;;
	1549	-vos*)
	1550	vendor=stratus
	1551	;;
	1552	esac
	1553	basic_machine=`echo $basic_machine \| sed "s/unknown/$vendor/"`
	1554	;;
	1555	esac
	1556
	1557	echo $basic_machine$os
	1558	exit 0
	1559
	1560	# Local variables:
	1561	# eval: (add-hook 'write-file-hooks 'time-stamp)
	1562	# time-stamp-start: "timestamp='"
	1563	# time-stamp-format: "%:y-%02m-%02d"
	1564	# time-stamp-end: "'"
	1565	# End:

+12

-0

debian/changelog less more

	0	guile-gnome-platform (2.7.99-2) unstable; urgency=low
	1
	2	* Pull in upstream changes as 01_dev-upstream-20050410.patch,
	3	containing build fixes (closes: #303624).
	4	- Use simple-patchsys from CDBS.
	5	- Build-Depend on g-wrap >= 1.9.5-2 since upstream changes depend on
	6	that.
	7	* Auto-generate control from control.in (currently disabled due to
	8	#301692).
	9
	10	-- Andreas Rottmann <rotty@debian.org> Sun, 10 Apr 2005 22:25:17 +0200
	11
0	12	guile-gnome-platform (2.7.99-1) unstable; urgency=low
1	13
2	14	* Initial packaging (closes: #205465).

-1

debian/control less more

2	2	Priority: extra
3	3	Maintainer: Andreas Rottmann <rotty@debian.org>
4	4	Standards-Version: 3.6.1
5		Build-Depends: debhelper (>= 4.1.0), cdbs, guile-1.6-dev, guile-1.6-slib, guile-library (>= 0.1.2), g-wrap (>= 1.9.4), guile-g-wrap (>= 1.9.4), libglib2.0-dev (>= 2.4.7), libgtk2.0-dev (>= 2.4.4), libgconf2-dev (>= 2.8.1), libglade2-dev (>= 1:2.4.0), libgnomevfs2-dev (>= 2.8.3), libgnome2-dev (>= 2.8.0), libgnomeui-dev (>= 2.8.0)
	5	Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.1.0) , automake1.8 , autoconf, patchutils, libtool, guile-1.6-dev, guile-1.6-slib, guile-library (>= 0.1.2), g-wrap (>= 1.9.5-2), guile-g-wrap (>= 1.9.5-2), libglib2.0-dev (>= 2.4.7), libgtk2.0-dev (>= 2.4.4), libgconf2-dev (>= 2.8.1), libglade2-dev (>= 1:2.4.0), libgnomevfs2-dev (>= 2.8.3), libgnome2-dev (>= 2.8.0), libgnomeui-dev (>= 2.8.0)
6	6
7	7	Package: guile-gnome0-glib
8	8	Architecture: any

+67

-0

debian/control.in less more

	0	Source: guile-gnome-platform
	1	Section: interpreters
	2	Priority: extra
	3	Maintainer: Andreas Rottmann <rotty@debian.org>
	4	Standards-Version: 3.6.1
	5	Build-Depends: @cdbs@, guile-1.6-dev, guile-1.6-slib, guile-library (>= 0.1.2), g-wrap (>= 1.9.5-2), guile-g-wrap (>= 1.9.5-2), libglib2.0-dev (>= 2.4.7), libgtk2.0-dev (>= 2.4.4), libgconf2-dev (>= 2.8.1), libglade2-dev (>= 1:2.4.0), libgnomevfs2-dev (>= 2.8.3), libgnome2-dev (>= 2.8.0), libgnomeui-dev (>= 2.8.0)
	6
	7	Package: guile-gnome0-glib
	8	Architecture: any
	9	Depends: guile-g-wrap (>= 1.9.4), ${shlibs:Depends}
	10	Description: Guile bindings for GLib
	11	This package contains Guile modules that provide access to the GLib
	12	library, including its object system, GObject.
	13
	14	Package: guile-gnome0-gconf
	15	Architecture: any
	16	Depends: ${shlibs:Depends}
	17	Description: Guile bindings for GConf
	18	This package contains Guile modules that provide access to the GConf
	19	library.
	20
	21	Package: guile-gnome0-gtk
	22	Architecture: any
	23	Depends: ${shlibs:Depends}
	24	Description: Guile bindings for GTK+, libglade, Pango and ATK
	25	This package contains Guile modules that provide access to the GTK+
	26	widget set library and its companion libraries libglade, Pango and
	27	ATK.
	28
	29	Package: guile-gnome0-gnome
	30	Architecture: any
	31	Depends: ${shlibs:Depends}
	32	Description: Guile bindings for libgnome
	33	This package contains Guile modules that provide access to the
	34	libgnome library.
	35
	36	Package: guile-gnome0-gnome-ui
	37	Architecture: any
	38	Depends: guile-gnome0-gtk (= ${Source-Version}), ${shlibs:Depends}
	39	Description: Guile bindings for libgnome
	40	This package contains Guile modules that provide access to the
	41	libgnomeui library.
	42
	43	Package: guile-gnome0-canvas
	44	Architecture: any
	45	Depends: ${shlibs:Depends}
	46	Description: Guile bindings for libgnomecanvas
	47	This package contains Guile modules that provide access to the
	48	libgnomecanvas library.
	49
	50	Package: guile-gnome0-vfs
	51	Architecture: any
	52	Depends: ${shlibs:Depends}
	53	Description: Guile bindings for GnomeVFS
	54	This package contains Guile modules that provide access to
	55	the GnomeVFS library.
	56
	57	Package: guile-gnome0-dev
	58	Section: libdevel
	59	Architecture: any
	60	Depends: g-wrap (>= 1.9.4), guile-gnome0-glib (= ${Source-Version})
	61	Description: Guile GObject binding support library, development files
	62	This package contains the development files for the Guile GObject
	63	binding support library.
	64	.
	65	You only need to install this package for building new wrapsets based
	66	on the guile-gnome GObject bindings.

+1309

-0

debian/patches/01_dev-update-20050410.patch less more

	0	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/ChangeLog platform-CURRENT/ChangeLog
	1	--- platform-2.7.99/ChangeLog 2005-04-06 17:20:24.000000000 +0200
	2	+++ platform-CURRENT/ChangeLog 2005-04-10 21:00:48.000000000 +0200
	3	@@ -1,3 +1,10 @@
	4	+2005-04-09 Andreas Rottmann <a.rottmann@gmx.at>
	5	+
	6	+ * dev-environ.in: Set LTDL_LIBRARY_PATH instead of
	7	+ LD_LIBRARY_PATH.
	8	+
	9	+ * h2def.py (find_enum_defs): Allow digits in enum names.
	10	+
	11	2005-03-06 Andy Wingo <wingo@pobox.com>
	12
	13	* scripts/make-release-note: Tweak evil regexps to correctly parse
	14	@@ -11,6 +18,22 @@
	15	(DISABLE_DEPRECATED): Add a general option to disable deprecated
	16	cflags.
	17
	18	+2005-02-24 Andreas Rottmann <a.rottmann@gmx.at>
	19	+
	20	+ * scripts/commit-all: Only commit when ChangeLog has been touched,
	21	+ thus avoiding arch-log-only commits.
	22	+
	23	+ * scripts/commit-all, scripts/merge-all: New helper scripts.
	24	+
	25	+2005-01-25 Andreas Rottmann <a.rottmann@gmx.at>
	26	+
	27	+ * configure.ac: Require G-Wrap >= 1.9.4.
	28	+
	29	+ * h2def.py (proto_pat): Fix for return types with spaces,
	30	+ e.g. unsigned long.
	31	+
	32	+ * common.mk (packages): Make out-of-tree-build-safe.
	33	+
	34	2005-01-12 Andy Wingo <wingo@pobox.com>
	35
	36	* == Released platform version 2.7.98 ==
	37	@@ -67,6 +90,11 @@
	38	building against an installed guile-gnome, guile-gnome of the
	39	right version is available. My English sucks!
	40
	41	+2004-10-13 Andreas Rottmann <a.rottmann@gmx.at>
	42	+
	43	+ * scripts/fork-archive-pkgs: Use -S option to "tla tag" instead of
	44	+ seperate archive-setup.
	45	+
	46	2004-10-29 Andy Wingo <wingo@pobox.com>
	47
	48	* common.mk: pkg-config versioning voodoo.
	49	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/common.mk platform-CURRENT/common.mk
	50	--- platform-2.7.99/common.mk 2005-01-10 19:36:41.000000000 +0100
	51	+++ platform-CURRENT/common.mk 2005-02-22 19:28:52.000000000 +0100
	52	@@ -69,6 +69,6 @@
	53	cp $< $@
	54
	55	# Real gnu make foo
	56	-packages = $(filter-out %-uninstalled,$(patsubst %.pc.in,%,$(wildcard *.pc.in)))
	57	+packages = $(filter-out %-uninstalled,$(patsubst %.pc.in,%,$(notdir $(wildcard $(srcdir)/*.pc.in))))
	58	pcifiles = $(patsubst %,%-@API_VERSION@.pc,$(packages))
	59	pcufiles = $(patsubst %,%-@API_VERSION@-uninstalled.pc,$(packages))
	60	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/defs/ChangeLog platform-CURRENT/defs/ChangeLog
	61	--- platform-2.7.99/defs/ChangeLog 2005-04-10 16:51:10.000000000 +0200
	62	+++ platform-CURRENT/defs/ChangeLog 2005-04-10 21:05:32.000000000 +0200
	63	@@ -2,6 +2,10 @@
	64
	65	* == Released guile-gnome-platform version 2.7.99 ==
	66
	67	+2005-01-25 Andreas Rottmann <a.rottmann@gmx.at>
	68	+
	69	+ * gnome/defs/Makefile.am (defs_DATA): Make out-of-tree-build-safe.
	70	+
	71	2005-01-11 Andy Wingo <wingo@pobox.com>
	72
	73	* == Released platform version 2.7.98 ==
	74	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/defs/gnome/defs/Makefile.am platform-CURRENT/defs/gnome/defs/Makefile.am
	75	--- platform-2.7.99/defs/gnome/defs/Makefile.am 2005-01-10 19:36:54.000000000 +0100
	76	+++ platform-CURRENT/defs/gnome/defs/Makefile.am 2005-02-28 02:14:17.000000000 +0100
	77	@@ -2,7 +2,7 @@
	78
	79	defsdir = $(guilemoduledir)/defs
	80
	81	-defs_DATA = $(wildcard *.defs)
	82	+defs_DATA = $(wildcard $(srcdir)/*.defs)
	83
	84	EXTRA_DIST = $(defs_DATA)
	85
	86	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/dev-environ.in platform-CURRENT/dev-environ.in
	87	--- platform-2.7.99/dev-environ.in 2005-01-10 19:36:41.000000000 +0100
	88	+++ platform-CURRENT/dev-environ.in 2005-04-10 14:12:37.000000000 +0200
	89	@@ -40,15 +40,15 @@
	90	fi
	91	if [ -f $src_dir/$pkg/shlib-dirs.ac ]; then
	92	for dir in `cat $src_dir/$pkg/shlib-dirs.ac`; do
	93	- LD_LIBRARY_PATH=$this_dir/$pkg/$dir:$LD_LIBRARY_PATH
	94	+ LTDL_LIBRARY_PATH=$this_dir/$pkg/$dir:$LTDL_LIBRARY_PATH
	95	done
	96	else
	97	- LD_LIBRARY_PATH=$this_dir/$pkg/gnome/gw:$LD_LIBRARY_PATH
	98	+ LTDL_LIBRARY_PATH=$this_dir/$pkg/gnome/gw:$LTDL_LIBRARY_PATH
	99	fi
	100	PKG_CONFIG_PATH=$this_dir/$pkg:$PKG_CONFIG_PATH
	101	fi
	102	done
	103
	104	-export GUILE_LOAD_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
	105	+export GUILE_LOAD_PATH LTDL_LIBRARY_PATH PKG_CONFIG_PATH
	106
	107	exec "$@"
	108	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/gconf/ChangeLog platform-CURRENT/gconf/ChangeLog
	109	--- platform-2.7.99/gconf/ChangeLog 2005-04-10 16:51:16.000000000 +0200
	110	+++ platform-CURRENT/gconf/ChangeLog 2005-04-10 16:52:58.000000000 +0200
	111	@@ -1,3 +1,8 @@
	112	+2005-04-10 Andreas Rottmann <a.rottmann@gmx.at>
	113	+
	114	+ * gnome/gw/gconf-support.c: Use new SCM<->gpointer conversion
	115	+ macros.
	116	+
	117	2005-03-06 Andy Wingo <wingo@pobox.com>
	118
	119	* == Released guile-gnome-platform version 2.7.99 ==
	120	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/gconf/gnome/gw/gconf-support.c platform-CURRENT/gconf/gnome/gw/gconf-support.c
	121	--- platform-2.7.99/gconf/gnome/gw/gconf-support.c 2005-01-10 19:37:01.000000000 +0100
	122	+++ platform-CURRENT/gconf/gnome/gw/gconf-support.c 2005-04-10 16:52:58.000000000 +0200
	123	@@ -230,7 +230,7 @@
	124	{
	125	SCM sclient, key, val, proc;
	126
	127	- proc = SCM_PACK (GPOINTER_TO_INT (user_data));
	128	+ proc = GPOINTER_TO_SCM (user_data);
	129	sclient = scm_c_gtype_instance_to_scm ((GTypeInstance*)client);
	130	key = scm_str2symbol (gconf_entry_get_key (entry));
	131	val = scm_c_gconf_value_to_scm (gconf_entry_get_value (entry));
	132	@@ -244,7 +244,7 @@
	133	{
	134	return gconf_client_notify_add
	135	(client, namespace_section, notify_proc,
	136	- GINT_TO_POINTER (SCM_UNPACK (scm_gc_protect_object (proc))),
	137	+ SCM_TO_GPOINTER (scm_gc_protect_object (proc)),
	138	(GFreeFunc)scm_gc_unprotect_object, err);
	139	}
	140
	141	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/glib/ChangeLog platform-CURRENT/glib/ChangeLog
	142	--- platform-2.7.99/glib/ChangeLog 2005-04-10 16:51:20.000000000 +0200
	143	+++ platform-CURRENT/glib/ChangeLog 2005-04-10 16:53:04.000000000 +0200
	144	@@ -1,3 +1,41 @@
	145	+2005-04-10 Andreas Rottmann <a.rottmann@gmx.at>
	146	+
	147	+ * gnome/gobject/gobject.c, gnome/gobject/gvalue.c,
	148	+ * gnome/gw/glib-support.c: Use the new macros.
	149	+ * gnome/gobject/gutil.h (GPOINTER_TO_SCM, SCM_TO_GPOINTER): New
	150	+ macros.
	151	+
	152	+2005-04-09 Andreas Rottmann <a.rottmann@gmx.at>
	153	+
	154	+ * gnome/gw/glib-spec.scm (initialize): Fix gsize, gssize in- and
	155	+ out-arguments.
	156	+
	157	+ * gnome/gw/glib-spec.scm (post-call-arg-cg): Use newly-added function
	158	+ scm_c_raise_gerror.
	159	+ * gnome/gobject/Makefile.am (C_FILES): Added gutil.c
	160	+ * gnome/gobject/gobject.h: #include gutil.h
	161	+ * gnome/gobject/gutil.c, gnome/gobject/gutil.h: New files.
	162	+
	163	+2005-04-07 Andreas Rottmann <a.rottmann@gmx.at>
	164	+
	165	+ * test-suite/gw-gobject.test, test-suite/gobject.test: Added a few
	166	+ tests relevant to the gvalue fixes.
	167	+
	168	+ * gnome/gw/support/defs.scm (load-defs): Improve error handling a
	169	+ bit by re-raising stacked conditions where appropriate.
	170	+
	171	+ * gnome/gobject/gvalue.c (scm_gvalue_primitive_get): Return a full
	172	+ goops instance when the gvalue contains an object.
	173	+
	174	+ * gnome/gobject/gvalue.c (scm_gvalue_primitive_set): Fix
	175	+ scm_list_p() check, needs to wrapped with SCM_BOOL().
	176	+ (scm_gvalue_primitive_set): Also handle goops gobject instances.
	177	+
	178	+2005-03-17 Andreas Rottmann <a.rottmann@gmx.at>
	179	+
	180	+ * gnome/gobject/gvalue.c (scm_gvalue_primitive_set): Fix memleak
	181	+ when setting a string value.
	182	+
	183	2005-03-06 Andy Wingo <wingo@pobox.com>
	184
	185	* gnome/gw/support/defs.scm: Don't make generics if the of-object
	186	@@ -5,6 +43,16 @@
	187	hack to make sure generics aren't created with unspecialized args,
	188	to prevent e.g. (foo-append <top> <top>) -> (append <top> <top>).
	189
	190	+2005-03-01 Andreas Rottmann <a.rottmann@gmx.at>
	191	+
	192	+ * gnome/overrides/glib.defs: Added g_io_add_watch_full to ignore
	193	+ list.
	194	+
	195	+ * examples/fifo.scm: Polished a bit.
	196	+
	197	+ * gnome/gw/support/defs.scm (load-defs): Re-enable logging of
	198	+ opaque types.
	199	+
	200	2005-01-29 Andreas Rottmann <a.rottmann@gmx.at>
	201
	202	* gnome/gw/support/gobject.scm (make-typespec): Make the methods
	203	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/glib/examples/fifo.scm platform-CURRENT/glib/examples/fifo.scm
	204	--- platform-2.7.99/glib/examples/fifo.scm 2005-01-10 19:37:07.000000000 +0100
	205	+++ platform-CURRENT/glib/examples/fifo.scm 2005-03-01 14:28:41.000000000 +0100
	206	@@ -1,7 +1,7 @@
	207	#! /usr/bin/guile -s
	208	!#
	209	;; guile-gnome
	210	-;; Copyright (C) 2004 Free Software Foundation, Inc.
	211	+;; Copyright (C) 2004-2005 Free Software Foundation, Inc.
	212
	213	;; This program is free software; you can redistribute it and/or
	214	;; modify it under the terms of the GNU General Public License as
	215	@@ -24,42 +24,45 @@
	216	(debug-enable 'backtrace)
	217
	218	(use-modules (srfi srfi-8)
	219	- (gnome gtk))
	220	-
	221	-(define FIFO (tmpnam))
	222	+ (gnome glib))
	223
	224	(define (stderr string . rest)
	225	(apply format (current-error-port) string rest)
	226	(force-output (current-error-port)))
	227
	228	-(define (stderr string . rest)
	229	- (apply format (cons (current-error-port) (cons string rest)))
	230	- (force-output (current-error-port)))
	231	-
	232	-(define (fifo-callback source condition)
	233	- (stderr "FIFO\n")
	234	+(define (fifo-callback loop source condition)
	235	+ (stderr "fifo\n")
	236	(receive (status line len term) (g-io-channel-read-line source)
	237	(stderr "result: ~S\n" line)
	238	(if (equal? line "exit\n")
	239	- (gtk-main-quit)))
	240	+ (g-main-loop-quit loop)))
	241	#t)
	242
	243	-(define (talk)
	244	+(define (talk fifo-name)
	245	(sleep 1)
	246	- (let ((fifo (open-file FIFO "w")))
	247	+ (let ((fifo (open-file fifo-name "w")))
	248	(display "Do you read me?\n" fifo)
	249	- (system (string-append "echo Do you read me>" FIFO))
	250	+ (system (string-append "echo Do you read me>" fifo-name))
	251	(sleep 2)
	252	(display "exit\n" fifo)
	253	- (system (string-append "echo exit >" FIFO))))
	254	-
	255	+ (system (string-append "echo exit >" fifo-name))))
	256	+
	257	(define (main)
	258	- (mknod FIFO 'fifo #o600 0)
	259	- (if (= 0 (primitive-fork))
	260	- (talk))
	261	- (g-io-add-watch (g-io-channel-new-file FIFO) 'in fifo-callback)
	262	- (gtk-main)
	263	- (delete-file FIFO))
	264	+ (let ((fifo (tmpnam))
	265	+ (loop (g-main-loop-new)))
	266	+
	267	+ (mknod fifo 'fifo #o600 0)
	268	+ (if (= 0 (primitive-fork))
	269	+ (begin
	270	+ (talk fifo)
	271	+ (exit 0)))
	272	+
	273	+ (g-io-add-watch
	274	+ (g-io-channel-new-file fifo) 'in
	275	+ (lambda (source condition) (fifo-callback loop source condition)))
	276	+
	277	+ (g-main-loop-run loop)
	278	+ (delete-file fifo)))
	279
	280	(main)
	281
	282	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/glib/gnome/gobject/.arch-ids/gutil.c.id platform-CURRENT/glib/gnome/gobject/.arch-ids/gutil.c.id
	283	--- platform-2.7.99/glib/gnome/gobject/.arch-ids/gutil.c.id 1970-01-01 01:00:00.000000000 +0100
	284	+++ platform-CURRENT/glib/gnome/gobject/.arch-ids/gutil.c.id 2005-04-10 14:11:54.000000000 +0200
	285	@@ -0,0 +1 @@
	286	+aa719e76-f248-414e-894b-3cd4a7aa086a
	287	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/glib/gnome/gobject/.arch-ids/gutil.h.id platform-CURRENT/glib/gnome/gobject/.arch-ids/gutil.h.id
	288	--- platform-2.7.99/glib/gnome/gobject/.arch-ids/gutil.h.id 1970-01-01 01:00:00.000000000 +0100
	289	+++ platform-CURRENT/glib/gnome/gobject/.arch-ids/gutil.h.id 2005-04-10 14:11:54.000000000 +0200
	290	@@ -0,0 +1 @@
	291	+8f55e0b6-2b1b-497d-80e8-a4e7c12c0119
	292	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/glib/gnome/gobject/Makefile.am platform-CURRENT/glib/gnome/gobject/Makefile.am
	293	--- platform-2.7.99/glib/gnome/gobject/Makefile.am 2005-01-10 19:37:07.000000000 +0100
	294	+++ platform-CURRENT/glib/gnome/gobject/Makefile.am 2005-04-10 14:11:54.000000000 +0200
	295	@@ -4,7 +4,7 @@
	296
	297	# libguile-gnome-gobject (core library)
	298
	299	-C_FILES = gobject.c gsignal.c gclosure.c gvalue.c gparameter.c gtype.c
	300	+C_FILES = gobject.c gsignal.c gclosure.c gvalue.c gparameter.c gtype.c gutil.c
	301	H_FILES = $(C_FILES:.c=.h)
	302
	303	libguile_gnome_gobject_@API_VERSION@_la_SOURCES = \
	304	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/glib/gnome/gobject/gobject.c platform-CURRENT/glib/gnome/gobject/gobject.c
	305	--- platform-2.7.99/glib/gnome/gobject/gobject.c 2005-01-10 19:37:07.000000000 +0100
	306	+++ platform-CURRENT/glib/gnome/gobject/gobject.c 2005-04-10 16:53:04.000000000 +0200
	307	@@ -71,7 +71,7 @@
	308	else
	309	g_object_set_qdata_full
	310	(gobject, g_quark_from_string (sym),
	311	- GINT_TO_POINTER (SCM_UNPACK (scm_gc_protect_object (val))),
	312	+ SCM_TO_GPOINTER (scm_gc_protect_object (val)),
	313	(GDestroyNotify)scm_gc_unprotect_object);
	314
	315	return SCM_UNSPECIFIED;
	316	@@ -95,7 +95,7 @@
	317	data = g_object_get_qdata (gobject, g_quark_from_string (sym));
	318
	319	if (data)
	320	- return SCM_PACK (GPOINTER_TO_INT (data));
	321	+ return GPOINTER_TO_SCM (data);
	322	else
	323	return SCM_UNBOUND;
	324	}
	325	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/glib/gnome/gobject/gobject.h platform-CURRENT/glib/gnome/gobject/gobject.h
	326	--- platform-2.7.99/glib/gnome/gobject/gobject.h 2005-01-10 19:37:07.000000000 +0100
	327	+++ platform-CURRENT/glib/gnome/gobject/gobject.h 2005-04-10 14:11:54.000000000 +0200
	328	@@ -28,6 +28,7 @@
	329	#include <guile-gnome-gobject/gparameter.h>
	330	#include <guile-gnome-gobject/gvalue.h>
	331	#include <guile-gnome-gobject/gsignal.h>
	332	+#include <guile-gnome-gobject/gutil.h>
	333
	334	G_BEGIN_DECLS
	335
	336	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/glib/gnome/gobject/gutil.c platform-CURRENT/glib/gnome/gobject/gutil.c
	337	--- platform-2.7.99/glib/gnome/gobject/gutil.c 1970-01-01 01:00:00.000000000 +0100
	338	+++ platform-CURRENT/glib/gnome/gobject/gutil.c 2005-04-10 14:11:54.000000000 +0200
	339	@@ -0,0 +1,40 @@
	340	+/* guile-gnome
	341	+ * Copyright (C) 2005 Andreas Rottmann
	342	+ *
	343	+ * gutil.c: Some GLib-related utilties
	344	+ *
	345	+ * This program is free software; you can redistribute it and/or
	346	+ * modify it under the terms of the GNU General Public License as
	347	+ * published by the Free Software Foundation; either version 2 of
	348	+ * the License, or (at your option) any later version.
	349	+ *
	350	+ * This program is distributed in the hope that it will be useful,
	351	+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
	352	+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	353	+ * GNU General Public License for more details.
	354	+ *
	355	+ * You should have received a copy of the GNU General Public License
	356	+ * along with this program; if not, contact:
	357	+ *
	358	+ * Free Software Foundation Voice: +1-617-542-5942
	359	+ * 59 Temple Place - Suite 330 Fax: +1-617-542-2652
	360	+ * Boston, MA 02111-1307, USA gnu@gnu.org
	361	+ */
	362	+
	363	+#include "gutil.h"
	364	+
	365	+SCM
	366	+scm_c_gerror_to_scm (GError *error)
	367	+{
	368	+ return scm_list_3 (scm_ulong2num(error->domain),
	369	+ scm_ulong2num(error->code),
	370	+ scm_makfrom0str(error->message));
	371	+}
	372	+
	373	+void
	374	+scm_c_raise_gerror (GError *error)
	375	+{
	376	+ SCM scm_gerror = scm_c_gerror_to_scm (error);
	377	+ g_error_free (error);
	378	+ scm_throw (scm_str2symbol("g-error"), scm_gerror);
	379	+}
	380	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/glib/gnome/gobject/gutil.h platform-CURRENT/glib/gnome/gobject/gutil.h
	381	--- platform-2.7.99/glib/gnome/gobject/gutil.h 1970-01-01 01:00:00.000000000 +0100
	382	+++ platform-CURRENT/glib/gnome/gobject/gutil.h 2005-04-10 16:53:04.000000000 +0200
	383	@@ -0,0 +1,41 @@
	384	+/* guile-gnome
	385	+ * Copyright (C) 2005 Andreas Rottmann
	386	+ *
	387	+ * gutil.h: Some GLib-related utilties
	388	+ *
	389	+ * This program is free software; you can redistribute it and/or
	390	+ * modify it under the terms of the GNU General Public License as
	391	+ * published by the Free Software Foundation; either version 2 of
	392	+ * the License, or (at your option) any later version.
	393	+ *
	394	+ * This program is distributed in the hope that it will be useful,
	395	+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
	396	+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	397	+ * GNU General Public License for more details.
	398	+ *
	399	+ * You should have received a copy of the GNU General Public License
	400	+ * along with this program; if not, contact:
	401	+ *
	402	+ * Free Software Foundation Voice: +1-617-542-5942
	403	+ * 59 Temple Place - Suite 330 Fax: +1-617-542-2652
	404	+ * Boston, MA 02111-1307, USA gnu@gnu.org
	405	+ */
	406	+
	407	+#ifndef __GUILE_GNOME_GOBJECT_GUTIL_H__
	408	+#define __GUILE_GNOME_GOBJECT_GUTIL_H__
	409	+
	410	+#include <glib.h>
	411	+#include <libguile.h>
	412	+
	413	+
	414	+G_BEGIN_DECLS
	415	+
	416	+#define SCM_TO_GPOINTER(scm) ((gpointer) SCM_UNPACK (scm))
	417	+#define GPOINTER_TO_SCM(ptr) (SCM_PACK ((scm_t_bits) (ptr)))
	418	+
	419	+SCM scm_c_gerror_to_scm (GError *error);
	420	+void scm_c_raise_gerror (GError *error);
	421	+
	422	+G_END_DECLS
	423	+
	424	+#endif
	425	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/glib/gnome/gobject/gvalue.c platform-CURRENT/glib/gnome/gobject/gvalue.c
	426	--- platform-2.7.99/glib/gnome/gobject/gvalue.c 2005-01-10 19:37:07.000000000 +0100
	427	+++ platform-CURRENT/glib/gnome/gobject/gvalue.c 2005-04-10 16:53:04.000000000 +0200
	428	@@ -27,6 +27,7 @@
	429	#include <stdio.h>
	430	#include <string.h>
	431	#include "gvalue.h"
	432	+#include "gobject.h"
	433	#include "guile-support.h"
	434
	435
	436	@@ -256,7 +257,7 @@
	437	if (SCM_FALSEP (value))
	438	g_value_set_string (gvalue, NULL);
	439	else
	440	- g_value_set_string (gvalue, g_strdup (SCM_STRING_CHARS (value)));
	441	+ g_value_set_string (gvalue, SCM_STRING_CHARS (value));
	442	break;
	443
	444	case G_TYPE_ENUM: {
	445	@@ -292,17 +293,22 @@
	446	if (SCM_FALSEP (value)) {
	447	g_value_set_object (gvalue, NULL);
	448	} else {
	449	- GTypeInstance *ginstance;
	450	+ gpointer ginstance;
	451	GType gtype;
	452
	453	- SCM_VALIDATE_GTYPE_INSTANCE_COPY (2, value, ginstance);
	454	+ if (SCM_GOBJECTP (value)) {
	455	+ SCM_VALIDATE_GOBJECT_COPY (2, value, ginstance);
	456	+ }
	457	+ else {
	458	+ SCM_VALIDATE_GTYPE_INSTANCE_COPY (2, value, ginstance);
	459	+ }
	460	gtype = G_TYPE_FROM_INSTANCE (ginstance);
	461
	462	switch (G_TYPE_FUNDAMENTAL (gtype)) {
	463	case G_TYPE_OBJECT:
	464	SCM_ASSERT (g_type_is_a (gtype, G_VALUE_TYPE (gvalue)),
	465	value, SCM_ARG2, FUNC_NAME);
	466	- g_value_set_object (gvalue, G_OBJECT (ginstance));
	467	+ g_value_set_object (gvalue, ginstance);
	468	break;
	469	default:
	470	SCM_ERROR_NOT_YET_IMPLEMENTED (value);
	471	@@ -314,8 +320,7 @@
	472	case G_TYPE_BOXED:
	473	if (G_VALUE_TYPE (gvalue) == G_TYPE_BOXED_SCM) {
	474	/* the copy func will protect the scm_value from GC */
	475	- g_value_set_boxed (gvalue,
	476	- GINT_TO_POINTER (SCM_UNPACK (value)));
	477	+ g_value_set_boxed (gvalue, SCM_TO_GPOINTER (value));
	478	} else if (G_VALUE_TYPE (gvalue) == G_TYPE_VALUE_ARRAY) {
	479	GValueArray *arr;
	480	gint len;
	481	@@ -327,10 +332,10 @@
	482	arr = g_value_array_new (len);
	483	while (len--) {
	484	GType value_type;
	485	- SCM val, v;
	486	+ SCM v;
	487
	488	v = SCM_CAR (value);
	489	-
	490	+
	491	if (SCM_STRINGP (v))
	492	value_type = G_TYPE_STRING;
	493	else if (SCM_BOOLP (v))
	494	@@ -341,15 +346,18 @@
	495	value_type = G_TYPE_DOUBLE;
	496	else if (SCM_CHARP (v))
	497	value_type = G_TYPE_CHAR;
	498	- else if (scm_list_p (v))
	499	+ else if (SCM_GOBJECTP (v)) {
	500	+ GObject *gobject;
	501	+ SCM_VALIDATE_GOBJECT_COPY (1, v, gobject);
	502	+ value_type = G_OBJECT_TYPE (gobject);
	503	+ }
	504	+ else if (SCM_BOOL (scm_list_p (v)))
	505	value_type = G_TYPE_VALUE_ARRAY;
	506	else
	507	scm_wrong_type_arg (FUNC_NAME, SCM_ARG1, v);
	508
	509	- val = scm_c_make_gvalue (value_type);
	510	- scm_gvalue_primitive_set (val, v);
	511	/* will copy the val */
	512	- g_value_array_append (arr, (GValue*) SCM_SMOB_DATA (val));
	513	+ g_value_array_append (arr, scm_c_scm_to_gvalue (value_type, v));
	514	value = SCM_CDR (value);
	515	}
	516
	517	@@ -428,7 +436,7 @@
	518	if (G_VALUE_TYPE (gvalue) == G_TYPE_BOXED_SCM) {
	519	if (!p)
	520	return SCM_UNSPECIFIED;
	521	- return SCM_PACK (GPOINTER_TO_INT (p));
	522	+ return GPOINTER_TO_SCM (p);
	523	} else if (G_VALUE_TYPE (gvalue) == G_TYPE_VALUE_ARRAY) {
	524	GValueArray *arr = p;
	525	gint i = arr ? arr->n_values : 0;
	526	@@ -450,8 +458,8 @@
	527	}
	528
	529	case G_TYPE_OBJECT:
	530	- /* scm_c_make_gtype_instance will ref the object for us */
	531	- return scm_c_make_gtype_instance (g_value_get_object (gvalue));
	532	+ /* scm_c_gtype_instance_to_scm will ref the object for us */
	533	+ return scm_c_gtype_instance_to_scm (g_value_get_object (gvalue));
	534
	535	case G_TYPE_PARAM:
	536	/* scm_c_make_gtype_instance will ref the object for us */
	537	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/glib/gnome/gw/glib-spec.scm platform-CURRENT/glib/gnome/gw/glib-spec.scm
	538	--- platform-2.7.99/glib/gnome/gw/glib-spec.scm 2005-01-10 19:37:07.000000000 +0100
	539	+++ platform-CURRENT/glib/gnome/gw/glib-spec.scm 2005-04-10 14:11:54.000000000 +0200
	540	@@ -120,8 +120,8 @@
	541	("GPid" int)
	542	("GTime" int32)
	543
	544	- ("gssize" int) ; fixme: system-dependant
	545	- ("gsize" unsigned-int) ; fixme: system-dependant
	546	+ ("gssize" ssize_t)
	547	+ ("gsize" size_t)
	548	("gunichar" unsigned-long)
	549
	550	("none" void)))
	551	@@ -138,7 +138,7 @@
	552	(add-type-alias! ws "GError**" '<GError>)
	553
	554	(add-type-rule! ws '(("gint" "")) '(int out))
	555	- (add-type-rule! ws '(("gsize" "")) '(unsigned-int out))
	556	+ (add-type-rule! ws '(("gsize" "")) '(size_t out))
	557	(add-type-rule! ws '(("gchar*" "")) '(mchars caller-owned out))
	558
	559	(load-defs-with-overrides ws "gnome/defs/glib.defs"))
	560	@@ -381,11 +381,7 @@
	561	(define-method (post-call-arg-cg (t <gerror-type>)
	562	(value <gw-value>)
	563	status-var)
	564	- (let* ((c-name (var value))
	565	- (typespec (typespec value)))
	566	+ (let* ((c-name (var value)))
	567	(list
	568	- "if (" c-name ") {\n"
	569	- " SCM scm_gerror = scm_list_3(scm_ulong2num(" c-name "->domain), scm_ulong2num(" c-name "->code), scm_makfrom0str(" c-name "->message));\n"
	570	- (destroy-value-cg t value status-var)
	571	- " scm_throw(scm_str2symbol(\"g-error\"), scm_gerror);\n"
	572	- "}\n")))
	573	+ "if (" c-name ")\n"
	574	+ " scm_c_raise_gerror(" c-name ");\n")))
	575	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/glib/gnome/gw/glib-support.c platform-CURRENT/glib/gnome/gw/glib-support.c
	576	--- platform-2.7.99/glib/gnome/gw/glib-support.c 2005-01-10 19:37:07.000000000 +0100
	577	+++ platform-CURRENT/glib/gnome/gw/glib-support.c 2005-04-10 16:53:04.000000000 +0200
	578	@@ -112,7 +112,7 @@
	579	SCM proc;
	580	SCM result;
	581
	582	- proc = SCM_PACK (GPOINTER_TO_INT (data));
	583	+ proc = GPOINTER_TO_SCM (data);
	584	result = scm_call_2 (proc,
	585	gw_wcp_assimilate_ptr (source, iochannel_type),
	586	scm_long2num (condition));
	587	@@ -134,6 +134,6 @@
	588	return g_io_add_watch (channel,
	589	condition,
	590	((GIOFunc) (g_io_func)),
	591	- GINT_TO_POINTER (SCM_UNPACK (func)));
	592	+ SCM_TO_GPOINTER (func));
	593	}
	594	#undef FUNC_NAME
	595	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/glib/gnome/gw/support/defs.scm platform-CURRENT/glib/gnome/gw/support/defs.scm
	596	--- platform-2.7.99/glib/gnome/gw/support/defs.scm 2005-04-10 16:51:20.000000000 +0200
	597	+++ platform-CURRENT/glib/gnome/gw/support/defs.scm 2005-04-10 14:11:54.000000000 +0200
	598	@@ -1,4 +1,5 @@
	599	;; guile-gnome
	600	+;; Copyright (C) 2005 Andreas Rottmann <rotty at debian dot org>
	601	;; Copyright (C) 2003,2004 Andy Wingo <wingo at pobox dot com>
	602
	603	;; This program is free software; you can redistribute it and/or
	604	@@ -29,10 +30,12 @@
	605	#:use-module (srfi srfi-1)
	606	#:use-module (srfi srfi-11)
	607	#:use-module (srfi srfi-13)
	608	+ #:use-module (srfi srfi-34)
	609	+ #:use-module (srfi srfi-35)
	610	#:use-module (ice-9 slib)
	611	#:use-module (ice-9 optargs)
	612	#:use-module (ice-9 regex)
	613	-
	614	+
	615	#:use-module (g-wrap)
	616	#:use-module (g-wrap c-types)
	617	#:use-module (g-wrap enumeration)
	618	@@ -343,7 +346,11 @@
	619	(warn "Invalid form in .defs file" exp file)
	620	(lp (read)))
	621	((assq (car exp) defs-handlers)
	622	- => (lambda (x) ((cadr x) exp) (lp (read))))
	623	+ => (lambda (x)
	624	+ (guard
	625	+ (c (#t (raise-stacked c "while processing def ~S" exp)))
	626	+ ((cadr x) exp))
	627	+ (lp (read))))
	628	((eq? (car exp) 'include)
	629	(let ((f (cond
	630	((eq? (cadr exp) 'overrides)
	631	@@ -371,25 +378,27 @@
	632	(dynamic-wind
	633	(lambda () (push (dirname abs-path) %load-path))
	634	(lambda ()
	635	- (with-input-from-file abs-path scan-defs)
	636	- ;; FIXME: re-establish
	637	- ;; (format log-file "Opaque types in the ~A wrapset: c-name scm-name\n\n"
	638	- ;; (name ws))
	639	- ;; (for-each
	640	- ;; (lambda (pair)
	641	- ;; (format log-file "~A ~A\n" (car pair) (cadr pair)))
	642	- ;; opaque-types)
	643	- (format log-file "\n\nBad method names in the ~A wrapset: c-name of-object\n\n"
	644	- (name ws))
	645	- (for-each
	646	- (lambda (pair)
	647	- (format log-file "~A ~A\n" (car pair) (cadr pair)))
	648	- bad-methods)
	649	- (close log-file)
	650	- ;; (format #t "\n\nWrapped ~A types (~A opaque) and ~A functions.\n"
	651	- ;; (+ num-types (length opaque-types)) (length opaque-types) num-functions)
	652	- (format #t "\nA list of opaque types and bad method names has been written to ~A.\n\n"
	653	- log-file-name))
	654	+ (guard
	655	+ (c
	656	+ (#t (raise-stacked c "while processing defs `~A'" abs-path)))
	657	+ (with-input-from-file abs-path scan-defs)
	658	+ (format log-file "Opaque types in the ~A wrapset: c-name scm-name\n\n"
	659	+ (name ws))
	660	+ (for-each-type (lambda (type)
	661	+ (if (is-a? type <gw-wct>)
	662	+ (format log-file "~A ~A\n" (c-type-name type) (name type))))
	663	+ ws)
	664	+ (format log-file "\n\nBad method names in the ~A wrapset: c-name of-object\n\n"
	665	+ (name ws))
	666	+ (for-each
	667	+ (lambda (pair)
	668	+ (format log-file "~A ~A\n" (car pair) (cadr pair)))
	669	+ bad-methods)
	670	+ (close log-file)
	671	+ ;; (format #t "\n\nWrapped ~A types (~A opaque) and ~A functions.\n"
	672	+ ;; (+ num-types (length opaque-types)) (length opaque-types) num-functions)
	673	+ (format #t "\nA list of opaque types and bad method names has been written to ~A.\n\n"
	674	+ log-file-name)))
	675
	676	(lambda () (pop %load-path)))))
	677
	678	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/glib/gnome/overrides/glib.defs platform-CURRENT/glib/gnome/overrides/glib.defs
	679	--- platform-2.7.99/glib/gnome/overrides/glib.defs 2005-01-10 19:37:07.000000000 +0100
	680	+++ platform-CURRENT/glib/gnome/overrides/glib.defs 2005-03-01 14:28:41.000000000 +0100
	681	@@ -1,5 +1,6 @@
	682	;; -- scheme --
	683	;; guile-gnome
	684	+;; Copyright (C) 2005 Andreas Rottmann <rotty at debian dot org>
	685	;; Copyright (C) 2003,2004 Andy Wingo <wingo at pobox dot com>
	686
	687	;; This program is free software; you can redistribute it and/or
	688	@@ -58,7 +59,7 @@
	689	"g_timeout_remove*"
	690	"g_idle_add*"
	691	"g_idle_remove*"
	692	- "g_io_add_watch"
	693	+ "g_io_add_watch_full"
	694	"g_error_*"
	695	"g_child_watch_add*"
	696	"g_parse_debug_string"
	697	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/glib/test-suite/gobject.test platform-CURRENT/glib/test-suite/gobject.test
	698	--- platform-2.7.99/glib/test-suite/gobject.test 2005-01-10 19:37:07.000000000 +0100
	699	+++ platform-CURRENT/glib/test-suite/gobject.test 2005-04-10 14:11:54.000000000 +0200
	700	@@ -103,6 +103,8 @@
	701	(pass-if "creating empty gchararray"
	702	(test <gchararray> #f))
	703
	704	+ (pass-if "creating gvalue array"
	705	+ (test <gvalue-array> '(1 2 3)))
	706	)
	707
	708	(with-test-prefix "creating genum and gflags types"
	709	@@ -245,6 +247,7 @@
	710	(gvalue? (gclosure-invoke closure-with-boxed-retval)))
	711	)
	712
	713	+
	714	;; Local Variables:
	715	;; mode: scheme
	716	;; End:
	717	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/glib/test-suite/gw-gobject.test platform-CURRENT/glib/test-suite/gw-gobject.test
	718	--- platform-2.7.99/glib/test-suite/gw-gobject.test 2005-01-10 19:37:07.000000000 +0100
	719	+++ platform-CURRENT/glib/test-suite/gw-gobject.test 2005-04-10 14:11:54.000000000 +0200
	720	@@ -45,7 +45,17 @@
	721	(= (length args) 1))))
	722
	723	(pass-if "calling foo"
	724	- (= (foo (make <test-obj>) 65000) 65000)))
	725	+ (= (foo (make <test-obj>) 65000) 65000))
	726	+
	727	+ (pass-if "gvalue conversion"
	728	+ (let ((obj (make <test-obj>)))
	729	+ (eq? (gvalue->scm (scm->gvalue gtype:gobject obj)) obj)))
	730	+
	731	+ (pass-if "gvalue array conversion"
	732	+ (let* ((obj (make <test-obj>))
	733	+ (array (make <gvalue-array> #:value (list obj obj))))
	734	+ (equal? (gvalue->scm array) (list obj obj))))
	735	+ )
	736
	737	;; Local Variables:
	738	;; mode: scheme
	739	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/gtk/ChangeLog platform-CURRENT/gtk/ChangeLog
	740	--- platform-2.7.99/gtk/ChangeLog 2005-04-10 16:51:28.000000000 +0200
	741	+++ platform-CURRENT/gtk/ChangeLog 2005-04-10 22:10:10.000000000 +0200
	742	@@ -1,3 +1,18 @@
	743	+2005-04-10 Andreas Rottmann <a.rottmann@gmx.at>
	744	+
	745	+ * gnome/gw/guile-gtk-tree-model.c, gnome/gw/gdk-pixbuf-support.c,
	746	+ * gnome/gw/gtk-support.c: Use new SCM<->gpointer conversion macros.
	747	+
	748	+2005-03-01 Andreas Rottmann <a.rottmann@gmx.at>
	749	+
	750	+ * gnome/gw/gdk-spec.scm (initialize): Added type-rules making
	751	+ gint* and guint* output args.
	752	+
	753	+2005-02-28 Andreas Rottmann <a.rottmann@gmx.at>
	754	+
	755	+ * gnome/overrides/gdk.defs (gdk_window_set_icon): Added override
	756	+ with null-ok options for parameters.
	757	+
	758	2005-03-06 Andy Wingo <wingo@pobox.com>
	759
	760	* == Released guile-gnome-platform version 2.7.99 ==
	761	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/gtk/gnome/gw/gdk-pixbuf-support.c platform-CURRENT/gtk/gnome/gw/gdk-pixbuf-support.c
	762	--- platform-2.7.99/gtk/gnome/gw/gdk-pixbuf-support.c 2005-01-10 19:37:15.000000000 +0100
	763	+++ platform-CURRENT/gtk/gnome/gw/gdk-pixbuf-support.c 2005-04-10 16:53:14.000000000 +0200
	764	@@ -30,7 +30,7 @@
	765	port_write_cb (const gchar buf, gsize count, GError *error,
	766	gpointer data)
	767	{
	768	- SCM port = SCM_PACK (GPOINTER_TO_INT (data));
	769	+ SCM port = GPOINTER_TO_SCM (data);
	770	scm_c_write (port, buf, count);
	771	return TRUE;
	772	}
	773	@@ -46,7 +46,7 @@
	774	/* ignoring options for now */
	775
	776	res = gdk_pixbuf_save_to_callback (pixbuf, port_write_cb,
	777	- GINT_TO_POINTER (SCM_UNPACK (port)),
	778	+ SCM_TO_GPOINTER (port),
	779	type, error, NULL);
	780	scm_remember_upto_here_1 (port);
	781	return res;
	782	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/gtk/gnome/gw/gdk-spec.scm platform-CURRENT/gtk/gnome/gw/gdk-spec.scm
	783	--- platform-2.7.99/gtk/gnome/gw/gdk-spec.scm 2005-01-10 19:37:15.000000000 +0100
	784	+++ platform-CURRENT/gtk/gnome/gw/gdk-spec.scm 2005-03-02 19:00:11.000000000 +0100
	785	@@ -1,4 +1,5 @@
	786	;; guile-gnome
	787	+;; Copyright (C) 2005 Andread Rottmann <rotty at debian dot org>
	788	;; Copyright (C) 2003,2004 Andy Wingo <wingo at pobox dot com>
	789
	790	;; This program is free software; you can redistribute it and/or
	791	@@ -117,6 +118,9 @@
	792	;; a hack now -- dunno what to do with this...
	793	(add-type-alias! ws "GdkNativeWindow" 'unsigned-long)
	794
	795	+ (add-type-rule! ws '(("gint" "")) '(int out))
	796	+ (add-type-rule! ws '(("guint" "")) '(unsigned-int out))
	797	+
	798	(wrap-custom-boxed!
	799	"GdkRectangle" "GDK_TYPE_RECTANGLE"
	800	;; wrap
	801	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/gtk/gnome/gw/gtk-support.c platform-CURRENT/gtk/gnome/gw/gtk-support.c
	802	--- platform-2.7.99/gtk/gnome/gw/gtk-support.c 2005-01-10 19:37:15.000000000 +0100
	803	+++ platform-CURRENT/gtk/gnome/gw/gtk-support.c 2005-04-10 16:53:14.000000000 +0200
	804	@@ -203,7 +203,7 @@
	805	{
	806	SCM proc;
	807
	808	- proc = SCM_PACK (GPOINTER_TO_INT (user_data));
	809	+ proc = GPOINTER_TO_SCM (user_data);
	810
	811	scm_call_2 (proc,
	812	scm_c_gtype_instance_to_scm ((GTypeInstance*) action),
	813	@@ -245,7 +245,7 @@
	814
	815	gtk_action_group_add_radio_actions (action_group, raes, len, value,
	816	G_CALLBACK (action_group_radio_actions_callback),
	817	- GINT_TO_POINTER (SCM_UNPACK (on_change)));
	818	+ SCM_TO_GPOINTER (on_change));
	819
	820	g_free (raes);
	821	}
	822	@@ -898,7 +898,7 @@
	823	GtkTreeModel tree_model, GtkTreeIter iter, gpointer data)
	824	{
	825	SCM proc, scolumn, scell, smodel, siter;
	826	- proc = SCM_PACK (GPOINTER_TO_INT (data));
	827	+ proc = GPOINTER_TO_SCM (data);
	828	scolumn = scm_c_gtype_instance_to_scm ((GTypeInstance*)tree_column);
	829	scell = scm_c_gtype_instance_to_scm ((GTypeInstance*)cell);
	830	smodel = scm_c_gtype_instance_to_scm ((GTypeInstance*)tree_model);
	831	@@ -914,7 +914,7 @@
	832	{
	833	gtk_tree_view_column_set_cell_data_func
	834	(tree_column, cell_renderer, cell_data_func,
	835	- GINT_TO_POINTER (SCM_UNPACK (scm_gc_protect_object (proc))),
	836	+ SCM_TO_GPOINTER (scm_gc_protect_object (proc)),
	837	(GtkDestroyNotify)scm_gc_unprotect_object);
	838	}
	839
	840	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/gtk/gnome/gw/guile-gtk-tree-model.c platform-CURRENT/gtk/gnome/gw/guile-gtk-tree-model.c
	841	--- platform-2.7.99/gtk/gnome/gw/guile-gtk-tree-model.c 2005-01-10 19:37:15.000000000 +0100
	842	+++ platform-CURRENT/gtk/gnome/gw/guile-gtk-tree-model.c 2005-04-10 16:53:14.000000000 +0200
	843	@@ -34,7 +34,7 @@
	844
	845	#define PROC_FROM_INSTANCE(instance, member) (((GuileGtkGenericTreeModel*)tree_model)->member)
	846
	847	-#define GET_ITER_VAL(iter) (SCM_PACK (GPOINTER_TO_INT (iter->user_data)))
	848	+#define GET_ITER_VAL(iter) (GPOINTER_TO_SCM (iter->user_data))
	849
	850	#define GET_ITER_VAL_OR_FALSE(iter) (iter ? GET_ITER_VAL (iter) : SCM_BOOL_F)
	851
	852	@@ -43,7 +43,7 @@
	853	if (iter->stamp == ((GuileGtkGenericTreeModel*)tree_model)->stamp && iter->user_data)\
	854	scm_gc_unprotect_object (GET_ITER_VAL (iter)); \
	855	iter->stamp = ((GuileGtkGenericTreeModel*)tree_model)->stamp; \
	856	- iter->user_data = GINT_TO_POINTER (SCM_UNPACK (scm_gc_protect_object (val))); \
	857	+ iter->user_data = SCM_TO_GPOINTER (scm_gc_protect_object (val)); \
	858	}G_STMT_END
	859
	860	#define SET_ITER_NULL(iter) \
	861	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/gtk/gnome/overrides/gdk.defs platform-CURRENT/gtk/gnome/overrides/gdk.defs
	862	--- platform-2.7.99/gtk/gnome/overrides/gdk.defs 2005-01-10 19:37:15.000000000 +0100
	863	+++ platform-CURRENT/gtk/gnome/overrides/gdk.defs 2005-03-01 14:10:41.000000000 +0100
	864	@@ -1,7 +1,8 @@
	865	;; -- scheme --
	866	;; guile-gnome
	867	+;; Copyright (C) 2005 Andreas Rottmann <rotty at debian dot org>
	868	;; Copyright (C) 2003,2004 Andy Wingo <wingo at pobox dot com>
	869	-
	870	+;;
	871	;; This program is free software; you can redistribute it and/or
	872	;; modify it under the terms of the GNU General Public License as
	873	;; published by the Free Software Foundation; either version 2 of
	874	@@ -33,6 +34,18 @@
	875	(return-type "SCM")
	876	(parameters '("GdkEvent*" "event")))
	877
	878	+(define-method set_icon
	879	+ (of-object "GdkWindow")
	880	+ (c-name "gdk_window_set_icon")
	881	+ (overrides "gdk_window_set_icon")
	882	+ (return-type "none")
	883	+ (parameters
	884	+ '("GdkWindow*" "icon_window" (null-ok))
	885	+ '("GdkPixmap*" "pixmap" (null-ok))
	886	+ '("GdkBitmap*" "mask" (null-ok))
	887	+ )
	888	+)
	889	+
	890	(ignore-glob "*_get_type"
	891	"_*"
	892	"*_ref"
	893	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/h2def.py platform-CURRENT/h2def.py
	894	--- platform-2.7.99/h2def.py 2005-01-10 19:36:41.000000000 +0100
	895	+++ platform-CURRENT/h2def.py 2005-04-10 14:12:37.000000000 +0200
	896	@@ -170,7 +170,7 @@
	897
	898	buf = re.sub('\n', ' ', buf)
	899
	900	- enum_pat = re.compile(r'enum\s{([^}])}\s([A-Z][A-Za-z])(\s\|;)')
	901	+ enum_pat = re.compile(r'enum\s{([^}])}\s([A-Z][A-Za-z0-9])(\s\|;)')
	902	splitter = re.compile(r'\s*,\s', re.MULTILINE)
	903	pos = 0
	904	while pos < len(buf):
	905	@@ -279,7 +279,7 @@
	906	return buf
	907
	908	proto_pat=re.compile(r"""
	909	-(?P<ret>(-\|\w\|\&\|\)+\s) # return type
	910	+(?P<ret>(\s\|-\|\w\|\&\|\)+\s) # return type
	911	\s+ # skip whitespace
	912	(?P<func>\w+)\s*[(] # match the function name until the opening (
	913	\s* # skip any whitespace
	914	@@ -299,7 +299,7 @@
	915	sys.stderr.write('No match:\|%s\|\n'%p)
	916	continue
	917	func = m.group('func')
	918	- ret = m.group('ret')
	919	+ ret = string.join(m.group('ret').split() ,"-")
	920	args=m.group('args')
	921	args=arg_split_pat.split(args)
	922	for i in range(len(args)):
	923	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/libglade/ChangeLog platform-CURRENT/libglade/ChangeLog
	924	--- platform-2.7.99/libglade/ChangeLog 2005-04-10 16:51:32.000000000 +0200
	925	+++ platform-CURRENT/libglade/ChangeLog 2005-04-10 16:53:19.000000000 +0200
	926	@@ -1,3 +1,8 @@
	927	+2005-04-10 Andreas Rottmann <a.rottmann@gmx.at>
	928	+
	929	+ * gnome/gw/glade-support.c: Use new SCM<->gpointer conversion
	930	+ macros.
	931	+
	932	2005-03-06 Andy Wingo <wingo@pobox.com>
	933
	934	* == Released guile-gnome-platform version 2.7.99 ==
	935	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/libglade/gnome/gw/glade-support.c platform-CURRENT/libglade/gnome/gw/glade-support.c
	936	--- platform-2.7.99/libglade/gnome/gw/glade-support.c 2005-01-10 19:37:19.000000000 +0100
	937	+++ platform-CURRENT/libglade/gnome/gw/glade-support.c 2005-04-10 16:53:19.000000000 +0200
	938	@@ -51,7 +51,7 @@
	939	SCM_VARIABLE_REF (scm_c_module_lookup (scm_glade_module,
	940	"gtype-instance-signal-connect-data"));
	941
	942	- proc = SCM_PACK (GPOINTER_TO_INT (user_data));
	943	+ proc = GPOINTER_TO_SCM (user_data);
	944	scm_call_4 (gtype_instance_signal_connect_data,
	945	scm_c_gtype_instance_to_scm ((GTypeInstance*)object),
	946	scm_str2symbol (signal_name),
	947	@@ -65,7 +65,7 @@
	948	{
	949	SCM_VALIDATE_PROC (3, proc);
	950	glade_xml_signal_connect_full (xml, handlername, connect_one,
	951	- GINT_TO_POINTER (SCM_UNPACK (proc)));
	952	+ SCM_TO_GPOINTER (proc));
	953	}
	954	#undef FUNC_NAME
	955
	956	@@ -81,7 +81,7 @@
	957	const gchar signal_data, GObject connect_object, gboolean after,
	958	gpointer user_data)
	959	{
	960	- SCM module = SCM_PACK (GPOINTER_TO_INT (user_data));
	961	+ SCM module = GPOINTER_TO_SCM (user_data);
	962	SCM proc = SCM_BOOL_F;
	963
	964	proc = scm_eval (scm_internal_catch (SCM_BOOL_T,
	965	@@ -96,14 +96,14 @@
	966	scm_makfrom0str (signal_name));
	967
	968	connect_one (NULL, object, signal_name, NULL, NULL, after,
	969	- GINT_TO_POINTER (SCM_UNPACK (proc)));
	970	+ SCM_TO_GPOINTER (proc));
	971	}
	972
	973	void
	974	_wrap_glade_xml_signal_autoconnect (GladeXML *xml, SCM module)
	975	{
	976	glade_xml_signal_autoconnect_full (xml, connect_many,
	977	- GINT_TO_POINTER (SCM_UNPACK (module)));
	978	+ SCM_TO_GPOINTER (module));
	979	}
	980
	981	GtkWidget*
	982	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/libgnomecanvas/ChangeLog platform-CURRENT/libgnomecanvas/ChangeLog
	983	--- platform-2.7.99/libgnomecanvas/ChangeLog 2005-04-10 16:51:39.000000000 +0200
	984	+++ platform-CURRENT/libgnomecanvas/ChangeLog 2005-04-10 21:44:29.000000000 +0200
	985	@@ -6,18 +6,32 @@
	986
	987	* == Released platform version 2.7.98 ==
	988
	989	-2004-12-06 Andy Wingo <wingo@pobox.com>
	990	+2005-04-09 Andreas Rottmann <a.rottmann@gmx.at>
	991
	992	- * == Released platform version 2.7.97 ==
	993	+ * gnome/overrides/libgnomecanvas.defs: Ignore some more functions.
	994
	995	-2004-11-15 Andy Wingo <wingo@pobox.com>
	996	+2005-01-24 Jan Nieuwenhuizen <janneke@gnu.org>
	997
	998	- * examples/canvas.scm: Use (gnome-0) now. Schitzophrenia.
	999	+ * examples/canvas.scm (main): Add return parameter example call
	1000	+ using receive.
	1001
	1002	- * package.ac: Add record_check.
	1003	+2005-01-23 Jan Nieuwenhuizen <janneke@gnu.org>
	1004	+
	1005	+ * gnome/gw/canvas-spec.scm (initialize): Add return parameter
	1006	+ override for double*.
	1007	+
	1008	+2004-11-16 Jan Nieuwenhuizen <janneke@gnu.org>
	1009	+
	1010	+ * examples/canvas.scm: Add line.
	1011
	1012	2004-11-14 Jan Nieuwenhuizen <janneke@gnu.org>
	1013
	1014	+ * gnome/gw/libgnomecanvas-support.c (_wrap_gnome_canvas_points_new):
	1015	+ New wrapper.
	1016	+
	1017	+ * gnome/overrides/libgnomecanvas.defs (gnome_canvas_points_new):
	1018	+ New override.
	1019	+
	1020	* gnome/canvas.scm (<gnome-canvas-path-def>): Add class.
	1021
	1022	* examples/canvas.scm (main): Add bezier.
	1023	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/libgnomecanvas/NEWS platform-CURRENT/libgnomecanvas/NEWS
	1024	--- platform-2.7.99/libgnomecanvas/NEWS 2005-04-10 16:51:39.000000000 +0200
	1025	+++ platform-CURRENT/libgnomecanvas/NEWS 2005-04-10 21:44:29.000000000 +0200
	1026	@@ -24,7 +24,7 @@
	1027	guile-gnome-libgnomecanvas 2.7.97 - Andy Wingo, 2004-12-05
	1028	==========================================================
	1029
	1030	-* Initial release with NEWS
	1031	+* Initial release
	1032
	1033
	1034	Copyright (C) 2004 Free Software Foundation, Inc.
	1035	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/libgnomecanvas/examples/canvas.scm platform-CURRENT/libgnomecanvas/examples/canvas.scm
	1036	--- platform-2.7.99/libgnomecanvas/examples/canvas.scm 2005-01-10 19:37:26.000000000 +0100
	1037	+++ platform-CURRENT/libgnomecanvas/examples/canvas.scm 2005-03-02 19:01:38.000000000 +0100
	1038	@@ -1,5 +1,5 @@
	1039	#! /bin/sh
	1040	-exec guile -s $0 "$@"
	1041	+exec guile-gnome-0 -s $0 "$@"
	1042	!#
	1043	;; guile-gnome
	1044	;; Copyright (C) 2004 Free Software Foundation, Inc.
	1045	@@ -21,8 +21,8 @@
	1046	;; 59 Temple Place - Suite 330 Fax: +1-617-542-2652
	1047	;; Boston, MA 02111-1307, USA gnu@gnu.org
	1048
	1049	-(use-modules (gnome-0)
	1050	- (gnome gtk)
	1051	+(use-modules (srfi srfi-8)
	1052	+ (gnome gtk)
	1053	(gnome gtk gdk-event)
	1054	(gnome canvas))
	1055
	1056	@@ -63,7 +63,19 @@
	1057	(add window vbox)
	1058	(add vbox canvas)
	1059
	1060	- (let* ((line (make <gnome-canvas-rect> #:parent canvas-root
	1061	+ (let* ((line (make <gnome-canvas-line> #:parent canvas-root
	1062	+ #:fill-color "black"
	1063	+ #:first-arrowhead #t
	1064	+ #:arrow-shape-a 10
	1065	+ #:arrow-shape-b 10
	1066	+ #:arrow-shape-c 10
	1067	+ #:line-style 'on-off-dash
	1068	+;;;FIXME: how to wrap this properly?
	1069	+;;;#:points #(0 0 100 100)))
	1070	+;;;ERROR: In procedure scm->gvalue:
	1071	+;;;ERROR: Don't know how to make values of type #<gtype GnomeCanvasPoints>
	1072	+ #:points (gnome-canvas-points-new #(0 0 100 100))))
	1073	+ (rect (make <gnome-canvas-rect> #:parent canvas-root
	1074	#:x1 0.0 #:y1 0.0 #:x2 100.0 #:y2 9.0
	1075	#:fill-color "black"))
	1076	(text (make <gnome-canvas-text> #:parent canvas-root
	1077	@@ -94,7 +106,7 @@
	1078	(for-each (lambda (item)
	1079	(move item -40 70)
	1080	(affine-relative item output-scale 0 0 output-scale 0 0))
	1081	- (list line bezier)))
	1082	+ (list rect bezier)))
	1083
	1084	(add vbox button)
	1085	(connect button 'clicked
	1086	@@ -106,6 +118,12 @@
	1087	;; (set-size-request button canvas-width 20) ?
	1088	(set-child-packing vbox button #f #f 0 'end)
	1089	(set-size-request canvas canvas-width canvas-height)
	1090	+
	1091	+ (set-pixels-per-unit canvas output-scale)
	1092	+ (receive (r x y)
	1093	+ (world-to-window canvas 1.0 1.0)
	1094	+ (stderr "result: ~S (~S, ~S)\n" r x y))
	1095	+ (set-pixels-per-unit canvas 1.0)
	1096
	1097	(show-all window)
	1098	(gtk-main)))
	1099	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/libgnomecanvas/gnome/gw/canvas-spec.scm platform-CURRENT/libgnomecanvas/gnome/gw/canvas-spec.scm
	1100	--- platform-2.7.99/libgnomecanvas/gnome/gw/canvas-spec.scm 2005-01-10 19:37:26.000000000 +0100
	1101	+++ platform-CURRENT/libgnomecanvas/gnome/gw/canvas-spec.scm 2005-03-02 19:01:38.000000000 +0100
	1102	@@ -47,8 +47,23 @@
	1103	"#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>\n"
	1104	"#include <libgnomecanvas/gnome-canvas-clipgroup.h>\n"
	1105	"#include \"libgnomecanvas-support.h\"\n"))
	1106	-
	1107	+
	1108	+(if #f
	1109	+ (custom-wrap-decls
	1110	+ "GnomeCanvasPoints"
	1111	+ ;; unwrap
	1112	+ (unwrap-null-checked
	1113	+ value status-var
	1114	+ (list c-var " = guile_gnome_scm_to_canvas_points (" scm-var ");\n"))
	1115	+ ;; wrap
	1116	+ (list scm-var " = guile_gnome_canvas_points_to_scm (" c-var ");\n"
	1117	+ "gnome_canvas_points_free (" c-var ");\n")))
	1118	+
	1119	+
	1120	(define-method (initialize (ws <canvas-wrapset>) initargs)
	1121	(next-method ws (cons #:module (cons '(gnome gw canvas) initargs)))
	1122	-
	1123	+ (if #f
	1124	+ (wrap-custom-pointer! "GnomeCanvasPoints"))
	1125	+ (add-type-alias! ws "double" 'double)
	1126	+ (add-type-rule! ws '(("double" "")) '(double out))
	1127	(load-defs-with-overrides ws "gnome/defs/libgnomecanvas.defs"))
	1128	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/libgnomecanvas/gnome/gw/libgnomecanvas-support.c platform-CURRENT/libgnomecanvas/gnome/gw/libgnomecanvas-support.c
	1129	--- platform-2.7.99/libgnomecanvas/gnome/gw/libgnomecanvas-support.c 2005-01-10 19:37:26.000000000 +0100
	1130	+++ platform-CURRENT/libgnomecanvas/gnome/gw/libgnomecanvas-support.c 2005-01-29 14:36:15.000000000 +0100
	1131	@@ -70,3 +70,99 @@
	1132	x1, y1, x2, y2, x3, y3));
	1133	}
	1134	#undef FUNC_NAME
	1135	+
	1136	+/*
	1137	+typedef struct {
	1138	+ double *coords;
	1139	+ int num_points;
	1140	+ int ref_count;
	1141	+} GnomeCanvasPoints;
	1142	+*/
	1143	+
	1144	+#if SCM_MINOR_VERSION < 7
	1145	+/* guile-1.6.x compatibility */
	1146	+#define SCM_VECTOR_REF(v, i) (SCM_VELTS ((v))[(i)])
	1147	+#define scm_is_number(x) (scm_number_p (x) ==SCM_BOOL_T)
	1148	+#define scm_to_double(x) (scm_num2dbl (x, "scm_to_double"))
	1149	+#define scm_from_int(x) SCM_MAKINUM (x)
	1150	+#define scm_from_double(x) (scm_make_real (x))
	1151	+#endif
	1152	+
	1153	+GnomeCanvasPoints *
	1154	+guile_gnome_scm_to_canvas_points (SCM scm)
	1155	+#define FUNC_NAME "guile-gnome-scm-to-canvas-points"
	1156	+{
	1157	+ GnomeCanvasPoints *points = NULL;
	1158	+ if (scm_vector_p (scm) == SCM_BOOL_T)
	1159	+ {
	1160	+ int length = SCM_VECTOR_LENGTH (scm);
	1161	+ points = gnome_canvas_points_new (length);
	1162	+ for (int i = 0; i < length; i++)
	1163	+ {
	1164	+ SCM s = SCM_VECTOR_REF (scm, i);
	1165	+ /* Just return NULL? */
	1166	+ SCM_ASSERT_TYPE (scm_is_number (s), s, SCM_ARG1, FUNC_NAME, "points");
	1167	+ (points->coords)[i] = scm_to_double (s);
	1168	+ }
	1169	+ }
	1170	+ else if (SCM_GVALUEP (scm))
	1171	+ {
	1172	+ /* We have to cater for GValue, because the code that takes a
	1173	+ marshalled GValue doesn't know how to convert that into a
	1174	+ scm */
	1175	+ GValue *value;
	1176	+ SCM_VALIDATE_GVALUE_TYPE_COPY (1, scm, GNOME_TYPE_CANVAS_POINTS, value);
	1177	+ points = g_value_dup_boxed (value);
	1178	+ }
	1179	+ return points;
	1180	+}
	1181	+#undef FUNC_NAME
	1182	+
	1183	+SCM
	1184	+guile_gnome_canvas_points_to_scm (GnomeCanvasPoints *points)
	1185	+{
	1186	+ int i;
	1187	+ SCM scm = scm_make_vector (scm_from_int (points->num_points),
	1188	+ scm_from_int (0));
	1189	+ for (i = 0; i < points->num_points; i++)
	1190	+ scm_vector_set_x (scm, scm_from_int (i),
	1191	+ scm_from_double ((points->coords)[i]));
	1192	+ return scm;
	1193	+}
	1194	+
	1195	+#ifndef SCM_GNOME_CANVAS_POINTS
	1196	+// arg -Werror breaks this nice trick
	1197	+//#message POINTS-POINTER
	1198	+GnomeCanvasPoints *
	1199	+_wrap_gnome_canvas_points_new (SCM scm)
	1200	+#define FUNC_NAME "gnome-canvas-points-new"
	1201	+{
	1202	+ SCM_ASSERT_TYPE (scm_vector_p (scm) == SCM_BOOL_T, scm, SCM_ARG1, FUNC_NAME,
	1203	+ "points");
	1204	+ return guile_gnome_scm_to_canvas_points (scm);
	1205	+}
	1206	+#undef FUNC_NAME
	1207	+#else
	1208	+//#warning POINTS-SCM
	1209	+SCM
	1210	+_wrap_gnome_canvas_points_new (SCM scm)
	1211	+#define FUNC_NAME "gnome-canvas-points-new"
	1212	+{
	1213	+ GnomeCanvasPoints *points;
	1214	+ SCM spoints;
	1215	+ SCM_ASSERT_TYPE (scm_vector_p (scm) == SCM_BOOL_T, scm, SCM_ARG1, FUNC_NAME,
	1216	+ "points");
	1217	+ points = guile_gnome_scm_to_canvas_points (scm);
	1218	+ spoints = scm_c_make_gvalue (GNOME_TYPE_CANVAS_POINTS);
	1219	+ g_value_set_boxed_take_ownership ((GValue*) SCM_SMOB_DATA (spoints), points);
	1220	+ return spoints;
	1221	+}
	1222	+#endif
	1223	+
	1224	+GnomeCanvasPoints *
	1225	+guile_gnome_canvas_points_copy (GnomeCanvasPoints *points)
	1226	+{
	1227	+ SCM scm = guile_gnome_canvas_points_to_scm (points);
	1228	+ return guile_gnome_scm_to_canvas_points (scm);
	1229	+}
	1230	+#undef FUNC_NAME
	1231	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/libgnomecanvas/gnome/gw/libgnomecanvas-support.h platform-CURRENT/libgnomecanvas/gnome/gw/libgnomecanvas-support.h
	1232	--- platform-2.7.99/libgnomecanvas/gnome/gw/libgnomecanvas-support.h 2005-01-10 19:37:26.000000000 +0100
	1233	+++ platform-CURRENT/libgnomecanvas/gnome/gw/libgnomecanvas-support.h 2005-01-29 14:36:15.000000000 +0100
	1234	@@ -34,5 +34,15 @@
	1235	double x1, double y1,
	1236	double x2, double y2,
	1237	double x3, double y3);
	1238	+
	1239	+GnomeCanvasPoints *guile_gnome_scm_to_canvas_points (SCM scm);
	1240	+SCM guile_gnome_canvas_points_to_scm (GnomeCanvasPoints *points);
	1241	+#ifndef SCM_GNOME_CANVAS_POINTS
	1242	+GnomeCanvasPoints *_wrap_gnome_canvas_points_new (SCM scm);
	1243	+#else
	1244	+SCM _wrap_gnome_canvas_points_new (SCM scm);
	1245	+#endif
	1246	+GnomeCanvasPoints guile_gnome_canvas_points_copy (GnomeCanvasPoints points);
	1247	+
	1248	#endif /* LIBGNOMECANVAS_SUPPORT_H */
	1249
	1250	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/libgnomecanvas/gnome/overrides/libgnomecanvas.defs platform-CURRENT/libgnomecanvas/gnome/overrides/libgnomecanvas.defs
	1251	--- platform-2.7.99/libgnomecanvas/gnome/overrides/libgnomecanvas.defs 2005-01-10 19:37:26.000000000 +0100
	1252	+++ platform-CURRENT/libgnomecanvas/gnome/overrides/libgnomecanvas.defs 2005-04-10 14:12:27.000000000 +0200
	1253	@@ -51,6 +51,33 @@
	1254	'("double" "x3")
	1255	'("double" "y3")))
	1256
	1257	+(define-boxed
	1258	+ CanvasPoints
	1259	+ (in-module "Gnome")
	1260	+ (c-name "GnomeCanvasPoints")
	1261	+ (gtype-id "GNOME_TYPE_CANVAS_POINTS")
	1262	+ (copy-func "guile_gnome_canvas_points_copy")
	1263	+ (release-func "gnome_canvas_points_free")
	1264	+;; (fields '("double*" "coords") '("int" "num_points") '("int" "ref_count"))
	1265	+ )
	1266	+
	1267	+(define-method
	1268	+ copy
	1269	+ (of-object "GnomeCanvasPoints")
	1270	+ (c-name "guile_gnome_canvas_points_copy")
	1271	+;; (overrides "gtk_tree_iter_copy")
	1272	+ (return-type "GnomeCanvasPoints*")
	1273	+ (caller-owns-return #t))
	1274	+
	1275	+(define-function gnome_canvas_points_new
	1276	+ (c-name "_wrap_gnome_canvas_points_new")
	1277	+ (overrides "gnome_canvas_points_new")
	1278	+ (is-constructor-of CanvasPoints)
	1279	+;; (return-type "GnomeCanvasPoints*")
	1280	+ (return-type "SCM")
	1281	+ (parameters
	1282	+ '("SCM" "points")))
	1283	+
	1284	(ignore-glob
	1285	;; if you need these, use gtype-from-name or gtype-class->type
	1286	"*_get_type"
	1287	@@ -64,7 +91,12 @@
	1288	"*_foreach"
	1289	"_affine"
	1290	"*_valist"
	1291	+ "_update_svp" ;; use of ArtVSP**
	1292	+ )
	1293
	1294	+(ignore
	1295	+ "gnome_canvas_item_construct" ;; use of va-list
	1296	+
	1297	;; ignore functions that deal in libart types
	1298	"gnome_canvas_cap_gdk_to_art"
	1299	"gnome_canvas_join_gdk_to_art"
	1300	diff -rN --exclude {arch} --exclude=scripts -u platform-2.7.99/libgnomecanvas/package.ac platform-CURRENT/libgnomecanvas/package.ac
	1301	--- platform-2.7.99/libgnomecanvas/package.ac 2005-01-10 19:37:26.000000000 +0100
	1302	+++ platform-CURRENT/libgnomecanvas/package.ac 2005-01-29 14:36:15.000000000 +0100
	1303	@@ -2,5 +2,3 @@
	1304	AC_SUBST(CANVAS_CFLAGS)
	1305	AC_SUBST(CANVAS_LIBS)
	1306	AM_CONDITIONAL(HAVE_CANVAS, $HAVE_CANVAS)
	1307	-
	1308	-record_check libgnomecanvas $HAVE_CANVAS

-0

debian/rules less more

1	1
2	2	#export DH_VERBOSE=1
3	3
	4	#DEB_AUTO_UPDATE_DEBIAN_CONTROL = true
	5	DEB_AUTO_UPDATE_AUTOCONF = 2.50
	6	DEB_AUTO_UPDATE_ACLOCAL = 1.8
	7	DEB_AUTO_UPDATE_AUTOMAKE = 1.8
	8
4	9	include /usr/share/cdbs/1/rules/debhelper.mk
5	10	include /usr/share/cdbs/1/class/autotools.mk
	11	include /usr/share/cdbs/1/rules/simple-patchsys.mk
6	12
7	13	DEB_DH_INSTALL_ARGS := --sourcedir=$(DEB_DESTDIR)
8	14