diff -urN jpeg.old/config.guess jpeg.dev/config.guess
---- jpeg.old/config.guess 1998-03-25 16:25:38.000000000 +0100
-+++ jpeg.dev/config.guess 2006-04-21 16:22:05.000000000 +0200
+--- jpeg.old/config.guess 2006-08-04 22:46:02.473275944 +0200
++++ jpeg.dev/config.guess 2006-08-04 22:53:56.904151488 +0200
@@ -1,7 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
-#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+
-+timestamp='2004-11-12'
++timestamp='2005-04-22'
+
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions. There is NO
if [ -x /usr/sbin/sysversion ] ; then
echo ${UNAME_MACHINE}-unknown-osf1mk
else
-@@ -434,196 +736,259 @@
+@@ -434,196 +736,262 @@
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
exit 0 ;;
- exit 0 ;;
- hp3[0-9][05]:NetBSD:*:*)
- echo m68k-hp-netbsd${UNAME_RELEASE}
+- exit 0 ;;
+- hp300:OpenBSD:*:*)
+- echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 5000:UNIX_System_V:4.*:*)
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit 0 ;;
-- hp300:OpenBSD:*:*)
-- echo m68k-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
- i?86:BSD/386:*:* | *:BSD/OS:*:*)
+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ exit 0 ;;
+ i*:UWIN*:*)
+ echo ${UNAME_MACHINE}-pc-uwin
++ exit 0 ;;
++ amd64:CYGWIN*:*:*)
++ echo x86_64-unknown-cygwin
exit 0 ;;
p*:CYGWIN*:*)
- echo powerpcle-unknown-cygwin32
# Unixware is an offshoot of SVR4, but it has its own version
# number series starting with 2...
# I am not positive that other SVR4 systems won't match this,
-@@ -631,28 +996,62 @@
+@@ -631,28 +999,62 @@
# Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit 0 ;;
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i386.
echo i386-pc-msdosdjgpp
-@@ -674,9 +1073,15 @@
+@@ -674,9 +1076,15 @@
# "miniframe"
echo m68010-convergent-sysv
exit 0 ;;
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-@@ -687,24 +1092,27 @@
+@@ -687,24 +1095,27 @@
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& echo i486-ncr-sysv4 && exit 0 ;;
RM*:SINIX-*:*:*)
echo mips-sni-sysv4
exit 0 ;;
-@@ -716,8 +1124,8 @@
+@@ -716,8 +1127,8 @@
echo ns32k-sni-sysv
fi
exit 0 ;;
echo i586-unisys-sysv4
exit 0 ;;
*:UNIX_System_V:4*:FTX*)
-@@ -729,25 +1137,130 @@
+@@ -729,25 +1140,137 @@
# From seanf@swdc.stratus.com.
echo i860-stratus-sysv4
exit 0 ;;
++ i*86:VOS:*:*)
++ # From Paul.Green@stratus.com.
++ echo ${UNAME_MACHINE}-stratus-vos
++ exit 0 ;;
+ *:VOS:*:*)
+ # From Paul.Green@stratus.com.
+ echo hppa1.1-stratus-vos
+ *:QNX:*:4*)
+ echo i386-pc-qnx
+ exit 0 ;;
++ NSE-?:NONSTOP_KERNEL:*:*)
++ echo nse-tandem-nsk${UNAME_RELEASE}
++ exit 0 ;;
+ NSR-?:NONSTOP_KERNEL:*:*)
+ echo nsr-tandem-nsk${UNAME_RELEASE}
+ exit 0 ;;
#ifdef _SEQUENT_
# include <sys/types.h>
# include <sys/utsname.h>
-@@ -785,7 +1298,10 @@
+@@ -785,7 +1308,10 @@
#endif
int version;
version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
exit (0);
#endif
-@@ -830,11 +1346,24 @@
+@@ -830,11 +1356,24 @@
#endif
#if defined (vax)
#endif
#if defined (alliant) && defined (i860)
-@@ -845,8 +1374,7 @@
+@@ -845,8 +1384,7 @@
}
EOF
# Apollos put the system type in the environment.
-@@ -878,6 +1406,48 @@
+@@ -878,6 +1416,50 @@
esac
fi
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
-+ ftp://ftp.gnu.org/pub/gnu/config/
++ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
++and
++ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+# time-stamp-end: "'"
+# End:
diff -urN jpeg.old/config.sub jpeg.dev/config.sub
---- jpeg.old/config.sub 1998-03-25 16:25:39.000000000 +0100
-+++ jpeg.dev/config.sub 2006-04-21 16:16:34.000000000 +0200
+--- jpeg.old/config.sub 2006-08-04 22:46:02.474275792 +0200
++++ jpeg.dev/config.sub 2006-08-04 22:53:56.904151488 +0200
@@ -1,6 +1,10 @@
#! /bin/sh
-# Configuration validation subroutine script, version 1.1.
-# Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
+# Configuration validation subroutine script.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+
-+timestamp='2004-11-30'
++timestamp='2005-04-22'
+
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
+version="\
+GNU config.sub ($timestamp)
+
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions. There is NO
-isc)
os=-isc2.2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -143,26 +215,74 @@
+@@ -143,26 +215,76 @@
-psos*)
os=-psos
;;
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
++ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+ | fr30 | frv \
+ | pyramid \
+ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
-+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
++ | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
++ | sparcv8 | sparcv9 | sparcv9b \
+ | strongarm \
+ | tahoe | thumb | tic4x | tic80 | tron \
+ | v850 | v850e \
basic_machine=$basic_machine-pc
;;
# Object if more than one company name word.
-@@ -171,27 +291,86 @@
+@@ -171,27 +293,87 @@
exit 1
;;
# Recognize the basic CPU types with company name.
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | avr-* \
-+ | bs2000-* \
++ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ | clipper-* | craynv-* | cydra-* \
+ | d10v-* | d30v-* | dlx-* \
+ | romp-* | rs6000-* \
+ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-+ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
++ | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
++ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
alliant | fx80)
basic_machine=fx80-alliant
;;
-@@ -202,25 +381,35 @@
+@@ -202,25 +384,35 @@
basic_machine=a29k-none
os=-bsd
;;
aux)
basic_machine=m68k-apple
os=-aux
-@@ -229,6 +418,10 @@
+@@ -229,6 +421,10 @@
basic_machine=ns32k-sequent
os=-dynix
;;
convex-c1)
basic_machine=c1-convex
os=-bsd
-@@ -249,27 +442,45 @@
+@@ -249,27 +445,45 @@
basic_machine=c38-convex
os=-bsd
;;
delta | 3300 | motorola-3300 | motorola-delta \
| 3300-motorola | delta-motorola)
basic_machine=m68k-motorola
-@@ -278,6 +489,10 @@
+@@ -278,6 +492,10 @@
basic_machine=m88k-motorola
os=-sysv3
;;
dpx20 | dpx20-*)
basic_machine=rs6000-bull
os=-bosx
-@@ -297,6 +512,10 @@
+@@ -297,6 +515,10 @@
encore | umax | mmax)
basic_machine=ns32k-encore
;;
fx2800)
basic_machine=i860-alliant
;;
-@@ -307,6 +526,10 @@
+@@ -307,6 +529,10 @@
basic_machine=tron-gmicro
os=-sysv
;;
h3050r* | hiux*)
basic_machine=hppa1.1-hitachi
os=-hiuxwe2
-@@ -315,6 +538,14 @@
+@@ -315,6 +541,14 @@
basic_machine=h8300-hitachi
os=-hms
;;
harris)
basic_machine=m88k-harris
os=-sysv3
-@@ -330,13 +561,30 @@
+@@ -330,13 +564,30 @@
basic_machine=m68k-hp
os=-hpux
;;
basic_machine=hppa1.1-hp
;;
hp9k8[0-9][0-9] | hp8[0-9][0-9])
-@@ -345,27 +593,42 @@
+@@ -345,27 +596,42 @@
hppa-next)
os=-nextstep3
;;
iris | iris4d)
basic_machine=mips-sgi
case $os in
-@@ -391,16 +654,16 @@
+@@ -391,16 +657,16 @@
basic_machine=ns32k-utek
os=-sysv
;;
;;
mips3*-*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-@@ -408,10 +671,34 @@
+@@ -408,10 +674,34 @@
mips3*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
;;
news | news700 | news800 | news900)
basic_machine=m68k-sony
os=-newsos
-@@ -424,6 +711,10 @@
+@@ -424,6 +714,10 @@
basic_machine=mips-sony
os=-newsos
;;
next | m*-next )
basic_machine=m68k-next
case $os in
-@@ -449,9 +740,40 @@
+@@ -449,9 +743,40 @@
basic_machine=i960-intel
os=-nindy
;;
pa-hitachi)
basic_machine=hppa1.1-hitachi
os=-hiuxwe2
-@@ -466,53 +788,95 @@
+@@ -466,53 +791,95 @@
pbb)
basic_machine=m68k-tti
;;
sequent)
basic_machine=i386-sequent
;;
-@@ -520,6 +884,13 @@
+@@ -520,6 +887,13 @@
basic_machine=sh-hitachi
os=-hms
;;
sps7)
basic_machine=m68k-bull
os=-sysv2
-@@ -527,6 +898,13 @@
+@@ -527,6 +901,13 @@
spur)
basic_machine=spur-unknown
;;
sun2)
basic_machine=m68000-sun
;;
-@@ -567,19 +945,51 @@
+@@ -567,19 +948,51 @@
sun386 | sun386i | roadrunner)
basic_machine=i386-sun
;;
udi29k)
basic_machine=a29k-amd
os=-udi
-@@ -588,6 +998,10 @@
+@@ -588,6 +1001,10 @@
basic_machine=a29k-nyu
os=-sym1
;;
vaxv)
basic_machine=vax-dec
os=-sysv
-@@ -597,8 +1011,8 @@
+@@ -597,8 +1014,8 @@
os=-vms
;;
vpp*|vx|vx-*)
vxworks960)
basic_machine=i960-wrs
os=-vxworks
-@@ -611,13 +1025,29 @@
+@@ -611,13 +1028,29 @@
basic_machine=a29k-wrs
os=-vxworks
;;
none)
basic_machine=none-none
os=-none
-@@ -625,32 +1055,47 @@
+@@ -625,32 +1058,47 @@
# Here we handle the default manufacturer of certain CPU types. It is in
# some cases the only manufacturer, in others, it is the most popular.
basic_machine=cydra-cydrome
;;
orion)
-@@ -659,6 +1104,15 @@
+@@ -659,6 +1107,15 @@
orion105)
basic_machine=clipper-highlevel
;;
*)
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
exit 1
-@@ -711,14 +1165,46 @@
+@@ -711,14 +1168,46 @@
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
-@@ -728,6 +1214,15 @@
+@@ -728,6 +1217,15 @@
-sunos6*)
os=`echo $os | sed -e 's|sunos6|solaris3|'`
;;
-osfrose*)
os=-osfrose
;;
-@@ -743,11 +1238,26 @@
+@@ -743,11 +1241,26 @@
-acis*)
os=-aos
;;
;;
# Preserve the version number of sinix5.
-sinix5.*)
-@@ -756,6 +1266,9 @@
+@@ -756,6 +1269,9 @@
-sinix*)
os=-sysv4
;;
-triton*)
os=-sysv3
;;
-@@ -774,9 +1287,27 @@
+@@ -774,9 +1290,27 @@
# This must come after -sysvr4.
-sysv*)
;;
-none)
;;
*)
-@@ -802,10 +1333,20 @@
+@@ -802,10 +1336,20 @@
*-acorn)
os=-riscix1.2
;;
os=-none
;;
*-dec | vax-*)
-@@ -823,15 +1364,42 @@
+@@ -823,15 +1367,42 @@
# default.
# os=-sunos4
;;
*-hp)
os=-hpux
;;
-@@ -874,27 +1442,39 @@
+@@ -874,27 +1445,39 @@
*-next)
os=-nextstep3
;;
*)
os=-none
;;
-@@ -916,9 +1496,15 @@
+@@ -916,9 +1499,15 @@
-aix*)
vendor=ibm
;;
-hiux*)
vendor=hitachi
;;
-@@ -934,21 +1520,47 @@
+@@ -934,21 +1523,47 @@
-genix*)
vendor=ns
;;