| blob | 81b12610571e4ccbaf2e17db484792199463672c |
1 diff -ur SDL_image-1.2.3/config.sub SDL_image-1.2.3-aros/config.sub
2 --- SDL_image-1.2.3/config.sub Wed Jan 17 12:17:51 2001
3 +++ SDL_image-1.2.3-aros/config.sub Sun Jul 18 17:54:35 2004
4 @@ -1,9 +1,9 @@
5 #! /bin/sh
6 # Configuration validation subroutine script.
7 -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
8 -# Free Software Foundation, Inc.
9 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
10 +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
12 -timestamp='2001-01-12'
13 +timestamp='2003-01-28'
15 # This file is (in principle) common to ALL GNU software.
16 # The presence of a machine in this file suggests that SOME GNU software
17 @@ -29,7 +29,8 @@
18 # configuration script generated by Autoconf, you may include it under
19 # the same distribution terms that you use for the rest of that program.
21 -# Please send patches to <config-patches@gnu.org>.
22 +# Please send patches to <config-patches@gnu.org>. Submit a context
23 +# diff and a properly formatted ChangeLog entry.
24 #
25 # Configuration subroutine to validate and canonicalize a configuration type.
26 # Supply the specified configuration type as an argument.
27 @@ -117,7 +118,7 @@
28 # Here we must recognize all the valid KERNEL-OS combinations.
29 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
30 case $maybe_os in
31 - nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
32 + nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
33 os=-$maybe_os
34 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
35 ;;
36 @@ -157,6 +158,14 @@
37 os=-vxworks
38 basic_machine=$1
39 ;;
40 + -chorusos*)
41 + os=-chorusos
42 + basic_machine=$1
43 + ;;
44 + -chorusrdb)
45 + os=-chorusrdb
46 + basic_machine=$1
47 + ;;
48 -hiux*)
49 os=-hiuxwe2
50 ;;
51 @@ -215,24 +224,48 @@
52 case $basic_machine in
53 # Recognize the basic CPU types without company name.
54 # Some are omitted here because they have special meanings below.
55 - tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
56 - | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
57 - | pyramid | mn10200 | mn10300 | tron | a29k \
58 - | 580 | i960 | h8300 \
59 - | x86 | ppcbe | mipsbe | mipsle | shbe | shle \
60 - | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
61 - | hppa64 \
62 - | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
63 - | alphaev6[78] \
64 - | we32k | ns16k | clipper | i370 | sh | sh[34] \
65 - | powerpc | powerpcle \
66 - | 1750a | dsp16xx | pdp10 | pdp11 \
67 - | mips16 | mips64 | mipsel | mips64el \
68 - | mips64orion | mips64orionel | mipstx39 | mipstx39el \
69 - | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
70 - | mips64vr5000 | miprs64vr5000el | mcore \
71 - | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
72 - | thumb | d10v | d30v | fr30 | avr | openrisc)
73 + 1750a | 580 \
74 + | a29k \
75 + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
76 + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
77 + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
78 + | clipper \
79 + | d10v | d30v | dlx | dsp16xx \
80 + | fr30 | frv \
81 + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
82 + | i370 | i860 | i960 | ia64 \
83 + | ip2k \
84 + | m32r | m68000 | m68k | m88k | mcore \
85 + | mips | mipsbe | mipseb | mipsel | mipsle \
86 + | mips16 \
87 + | mips64 | mips64el \
88 + | mips64vr | mips64vrel \
89 + | mips64orion | mips64orionel \
90 + | mips64vr4100 | mips64vr4100el \
91 + | mips64vr4300 | mips64vr4300el \
92 + | mips64vr5000 | mips64vr5000el \
93 + | mipsisa32 | mipsisa32el \
94 + | mipsisa32r2 | mipsisa32r2el \
95 + | mipsisa64 | mipsisa64el \
96 + | mipsisa64sb1 | mipsisa64sb1el \
97 + | mipsisa64sr71k | mipsisa64sr71kel \
98 + | mipstx39 | mipstx39el \
99 + | mn10200 | mn10300 \
100 + | msp430 \
101 + | ns16k | ns32k \
102 + | openrisc | or32 \
103 + | pdp10 | pdp11 | pj | pjl \
104 + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
105 + | pyramid \
106 + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
107 + | sh64 | sh64le \
108 + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
109 + | strongarm \
110 + | tahoe | thumb | tic80 | tron \
111 + | v850 | v850e \
112 + | we32k \
113 + | x86 | xscale | xstormy16 | xtensa \
114 + | z8k)
115 basic_machine=$basic_machine-unknown
116 ;;
117 m6811 | m68hc11 | m6812 | m68hc12)
118 @@ -240,13 +273,13 @@
119 basic_machine=$basic_machine-unknown
120 os=-none
121 ;;
122 - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
123 + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
124 ;;
126 # We use `pc' rather than `unknown'
127 # because (1) that's what they normally are, and
128 # (2) the word "unknown" tends to confuse beginning users.
129 - i[234567]86 | x86_64)
130 + i*86 | x86_64)
131 basic_machine=$basic_machine-pc
132 ;;
133 # Object if more than one company name word.
134 @@ -255,29 +288,58 @@
135 exit 1
136 ;;
137 # Recognize the basic CPU types with company name.
138 - # FIXME: clean up the formatting here.
139 - vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
140 - | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
141 - | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
142 - | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
143 - | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
144 - | xmp-* | ymp-* \
145 - | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
146 - | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
147 - | hppa2.0n-* | hppa64-* \
148 - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
149 - | alphaev6[78]-* \
150 - | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
151 - | clipper-* | orion-* \
152 - | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
153 - | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
154 - | mips64el-* | mips64orion-* | mips64orionel-* \
155 - | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
156 - | mipstx39-* | mipstx39el-* | mcore-* \
157 - | f30[01]-* | f700-* | s390-* | sv1-* | t3e-* \
158 - | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
159 - | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
160 - | bs2000-* | tic54x-* | c54x-* | x86_64-*)
161 + 580-* \
162 + | a29k-* \
163 + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
164 + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
165 + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
166 + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
167 + | avr-* \
168 + | bs2000-* \
169 + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
170 + | clipper-* | cydra-* \
171 + | d10v-* | d30v-* | dlx-* \
172 + | elxsi-* \
173 + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
174 + | h8300-* | h8500-* \
175 + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
176 + | i*86-* | i860-* | i960-* | ia64-* \
177 + | ip2k-* \
178 + | m32r-* \
179 + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
180 + | m88110-* | m88k-* | mcore-* \
181 + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
182 + | mips16-* \
183 + | mips64-* | mips64el-* \
184 + | mips64vr-* | mips64vrel-* \
185 + | mips64orion-* | mips64orionel-* \
186 + | mips64vr4100-* | mips64vr4100el-* \
187 + | mips64vr4300-* | mips64vr4300el-* \
188 + | mips64vr5000-* | mips64vr5000el-* \
189 + | mipsisa32-* | mipsisa32el-* \
190 + | mipsisa32r2-* | mipsisa32r2el-* \
191 + | mipsisa64-* | mipsisa64el-* \
192 + | mipsisa64sb1-* | mipsisa64sb1el-* \
193 + | mipsisa64sr71k-* | mipsisa64sr71kel-* \
194 + | mipstx39-* | mipstx39el-* \
195 + | msp430-* \
196 + | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
197 + | orion-* \
198 + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
199 + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
200 + | pyramid-* \
201 + | romp-* | rs6000-* \
202 + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
203 + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
204 + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
205 + | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
206 + | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
207 + | v850-* | v850e-* | vax-* \
208 + | we32k-* \
209 + | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
210 + | xtensa-* \
211 + | ymp-* \
212 + | z8k-*)
213 ;;
214 # Recognize the various machine names and aliases which stand
215 # for a CPU type and a company and sometimes even an OS.
216 @@ -340,6 +402,10 @@
217 basic_machine=ns32k-sequent
218 os=-dynix
219 ;;
220 + c90)
221 + basic_machine=c90-cray
222 + os=-unicos
223 + ;;
224 convex-c1)
225 basic_machine=c1-convex
226 os=-bsd
227 @@ -360,16 +426,8 @@
228 basic_machine=c38-convex
229 os=-bsd
230 ;;
231 - cray | ymp)
232 - basic_machine=ymp-cray
233 - os=-unicos
234 - ;;
235 - cray2)
236 - basic_machine=cray2-cray
237 - os=-unicos
238 - ;;
239 - [ctj]90-cray)
240 - basic_machine=c90-cray
241 + cray | j90)
242 + basic_machine=j90-cray
243 os=-unicos
244 ;;
245 crds | unos)
246 @@ -384,6 +442,14 @@
247 decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
248 basic_machine=mips-dec
249 ;;
250 + decsystem10* | dec10*)
251 + basic_machine=pdp10-dec
252 + os=-tops10
253 + ;;
254 + decsystem20* | dec20*)
255 + basic_machine=pdp10-dec
256 + os=-tops20
257 + ;;
258 delta | 3300 | motorola-3300 | motorola-delta \
259 | 3300-motorola | delta-motorola)
260 basic_machine=m68k-motorola
261 @@ -425,6 +491,10 @@
262 basic_machine=tron-gmicro
263 os=-sysv
264 ;;
265 + go32)
266 + basic_machine=i386-pc
267 + os=-go32
268 + ;;
269 h3050r* | hiux*)
270 basic_machine=hppa1.1-hitachi
271 os=-hiuxwe2
272 @@ -500,19 +570,19 @@
273 basic_machine=i370-ibm
274 ;;
275 # I'm not sure what "Sysv32" means. Should this be sysv3.2?
276 - i[34567]86v32)
277 + i*86v32)
278 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
279 os=-sysv32
280 ;;
281 - i[34567]86v4*)
282 + i*86v4*)
283 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
284 os=-sysv4
285 ;;
286 - i[34567]86v)
287 + i*86v)
288 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
289 os=-sysv
290 ;;
291 - i[34567]86sol2)
292 + i*86sol2)
293 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
294 os=-solaris2
295 ;;
296 @@ -524,18 +594,6 @@
297 basic_machine=i386-unknown
298 os=-vsta
299 ;;
300 - i386-go32 | go32)
301 - basic_machine=i386-unknown
302 - os=-go32
303 - ;;
304 - i386-mingw32 | mingw32)
305 - basic_machine=i386-unknown
306 - os=-mingw32
307 - ;;
308 - i[34567]86-pw32 | pw32)
309 - basic_machine=i586-unknown
310 - os=-pw32
311 - ;;
312 iris | iris4d)
313 basic_machine=mips-sgi
314 case $os in
315 @@ -561,6 +619,10 @@
316 basic_machine=ns32k-utek
317 os=-sysv
318 ;;
319 + mingw32)
320 + basic_machine=i386-pc
321 + os=-mingw32
322 + ;;
323 miniframe)
324 basic_machine=m68000-convergent
325 ;;
326 @@ -568,14 +630,6 @@
327 basic_machine=m68k-atari
328 os=-mint
329 ;;
330 - mipsel*-linux*)
331 - basic_machine=mipsel-unknown
332 - os=-linux-gnu
333 - ;;
334 - mips*-linux*)
335 - basic_machine=mips-unknown
336 - os=-linux-gnu
337 - ;;
338 mips3*-*)
339 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
340 ;;
341 @@ -590,8 +644,12 @@
342 basic_machine=m68k-rom68k
343 os=-coff
344 ;;
345 + morphos)
346 + basic_machine=powerpc-unknown
347 + os=-morphos
348 + ;;
349 msdos)
350 - basic_machine=i386-unknown
351 + basic_machine=i386-pc
352 os=-msdos
353 ;;
354 mvs)
355 @@ -662,6 +720,10 @@
356 np1)
357 basic_machine=np1-gould
358 ;;
359 + nv1)
360 + basic_machine=nv1-cray
361 + os=-unicosmp
362 + ;;
363 nsr-tandem)
364 basic_machine=nsr-tandem
365 ;;
366 @@ -669,6 +731,10 @@
367 basic_machine=hppa1.1-oki
368 os=-proelf
369 ;;
370 + or32 | or32-*)
371 + basic_machine=or32-unknown
372 + os=-coff
373 + ;;
374 OSE68000 | ose68000)
375 basic_machine=m68000-ericsson
376 os=-ose
377 @@ -691,19 +757,19 @@
378 pbb)
379 basic_machine=m68k-tti
380 ;;
381 - pc532 | pc532-*)
382 + pc532 | pc532-*)
383 basic_machine=ns32k-pc532
384 ;;
385 - pentium | p5 | k5 | k6 | nexgen)
386 + pentium | p5 | k5 | k6 | nexgen | viac3)
387 basic_machine=i586-pc
388 ;;
389 - pentiumpro | p6 | 6x86 | athlon)
390 + pentiumpro | p6 | 6x86 | athlon | athlon_*)
391 basic_machine=i686-pc
392 ;;
393 pentiumii | pentium2)
394 basic_machine=i686-pc
395 ;;
396 - pentium-* | p5-* | k5-* | k6-* | nexgen-*)
397 + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
398 basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
399 ;;
400 pentiumpro-* | p6-* | 6x86-* | athlon-*)
401 @@ -718,18 +784,32 @@
402 power) basic_machine=power-ibm
403 ;;
404 ppc) basic_machine=powerpc-unknown
405 - ;;
406 + ;;
407 ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
408 ;;
409 ppcle | powerpclittle | ppc-le | powerpc-little)
410 basic_machine=powerpcle-unknown
411 - ;;
412 + ;;
413 ppcle-* | powerpclittle-*)
414 basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
415 ;;
416 + ppc64) basic_machine=powerpc64-unknown
417 + ;;
418 + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
419 + ;;
420 + ppc64le | powerpc64little | ppc64-le | powerpc64-little)
421 + basic_machine=powerpc64le-unknown
422 + ;;
423 + ppc64le-* | powerpc64little-*)
424 + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
425 + ;;
426 ps2)
427 basic_machine=i386-ibm
428 ;;
429 + pw32)
430 + basic_machine=i586-unknown
431 + os=-pw32
432 + ;;
433 rom68k)
434 basic_machine=m68k-rom68k
435 os=-coff
436 @@ -740,10 +820,22 @@
437 rtpc | rtpc-*)
438 basic_machine=romp-ibm
439 ;;
440 + s390 | s390-*)
441 + basic_machine=s390-ibm
442 + ;;
443 + s390x | s390x-*)
444 + basic_machine=s390x-ibm
445 + ;;
446 sa29200)
447 basic_machine=a29k-amd
448 os=-udi
449 ;;
450 + sb1)
451 + basic_machine=mipsisa64sb1-unknown
452 + ;;
453 + sb1el)
454 + basic_machine=mipsisa64sb1el-unknown
455 + ;;
456 sequent)
457 basic_machine=i386-sequent
458 ;;
459 @@ -751,7 +843,7 @@
460 basic_machine=sh-hitachi
461 os=-hms
462 ;;
463 - sparclite-wrs)
464 + sparclite-wrs | simso-wrs)
465 basic_machine=sparclite-wrs
466 os=-vxworks
467 ;;
468 @@ -818,9 +910,17 @@
469 os=-dynix
470 ;;
471 t3e)
472 - basic_machine=t3e-cray
473 + basic_machine=alphaev5-cray
474 os=-unicos
475 ;;
476 + t90)
477 + basic_machine=t90-cray
478 + os=-unicos
479 + ;;
480 + tic4x | c4x*)
481 + basic_machine=tic4x-unknown
482 + os=-coff
483 + ;;
484 tic54x | c54x*)
485 basic_machine=tic54x-unknown
486 os=-coff
487 @@ -831,6 +931,10 @@
488 tx39el)
489 basic_machine=mipstx39el-unknown
490 ;;
491 + toad1)
492 + basic_machine=pdp10-xkl
493 + os=-tops20
494 + ;;
495 tower | tower-32)
496 basic_machine=m68k-ncr
497 ;;
498 @@ -855,8 +959,8 @@
499 os=-vms
500 ;;
501 vpp*|vx|vx-*)
502 - basic_machine=f301-fujitsu
503 - ;;
504 + basic_machine=f301-fujitsu
505 + ;;
506 vxworks960)
507 basic_machine=i960-wrs
508 os=-vxworks
509 @@ -877,13 +981,13 @@
510 basic_machine=hppa1.1-winbond
511 os=-proelf
512 ;;
513 - xmp)
514 - basic_machine=xmp-cray
515 - os=-unicos
516 - ;;
517 - xps | xps100)
518 + xps | xps100)
519 basic_machine=xps100-honeywell
520 ;;
521 + ymp)
522 + basic_machine=ymp-cray
523 + os=-unicos
524 + ;;
525 z8k-*-coff)
526 basic_machine=z8k-unknown
527 os=-sim
528 @@ -904,13 +1008,6 @@
529 op60c)
530 basic_machine=hppa1.1-oki
531 ;;
532 - mips)
533 - if [ x$os = x-linux-gnu ]; then
534 - basic_machine=mips-unknown
535 - else
536 - basic_machine=mips-mips
537 - fi
538 - ;;
539 romp)
540 basic_machine=romp-ibm
541 ;;
542 @@ -930,13 +1027,16 @@
543 we32k)
544 basic_machine=we32k-att
545 ;;
546 - sh3 | sh4)
547 + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
548 basic_machine=sh-unknown
549 ;;
550 - sparc | sparcv9)
551 + sh64)
552 + basic_machine=sh64-unknown
553 + ;;
554 + sparc | sparcv9 | sparcv9b)
555 basic_machine=sparc-sun
556 ;;
557 - cydra)
558 + cydra)
559 basic_machine=cydra-cydrome
560 ;;
561 orion)
562 @@ -951,9 +1051,8 @@
563 pmac | pmac-mpw)
564 basic_machine=powerpc-apple
565 ;;
566 - c4x*)
567 - basic_machine=c4x-none
568 - os=-coff
569 + *-unknown)
570 + # Make sure to match an already-canonicalized machine name.
571 ;;
572 *)
573 echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
574 @@ -1011,24 +1110,30 @@
575 | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
576 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
577 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
578 + | -chorusos* | -chorusrdb* \
579 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
580 | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
581 - | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
582 + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
583 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
584 - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
585 + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
586 + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
587 + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
588 + | -powermax* | -dnix* | -microbsd*)
589 # Remember, each alternative MUST END IN *, to match a version number.
590 ;;
591 -qnx*)
592 case $basic_machine in
593 - x86-* | i[34567]86-*)
594 + x86-* | i*86-*)
595 ;;
596 *)
597 os=-nto$os
598 ;;
599 esac
600 ;;
601 + -nto-qnx*)
602 + ;;
603 -nto*)
604 - os=-nto-qnx
605 + os=`echo $os | sed -e 's|nto|nto-qnx|'`
606 ;;
607 -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
608 | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
609 @@ -1067,14 +1172,20 @@
610 -acis*)
611 os=-aos
612 ;;
613 + -atheos*)
614 + os=-atheos
615 + ;;
616 -386bsd)
617 os=-bsd
618 ;;
619 -ctix* | -uts*)
620 os=-sysv
621 ;;
622 + -nova*)
623 + os=-rtmk-nova
624 + ;;
625 -ns2 )
626 - os=-nextstep2
627 + os=-nextstep2
628 ;;
629 -nsk*)
630 os=-nsk
631 @@ -1113,8 +1224,11 @@
632 -xenix)
633 os=-xenix
634 ;;
635 - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
636 - os=-mint
637 + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
638 + os=-mint
639 + ;;
640 + -aros*)
641 + os=-aros
642 ;;
643 -none)
644 ;;
645 @@ -1147,10 +1261,11 @@
646 arm*-semi)
647 os=-aout
648 ;;
649 + # This must come before the *-dec entry.
650 pdp10-*)
651 os=-tops20
652 ;;
653 - pdp11-*)
654 + pdp11-*)
655 os=-none
656 ;;
657 *-dec | vax-*)
658 @@ -1177,6 +1292,9 @@
659 mips*-*)
660 os=-elf
661 ;;
662 + or32-*)
663 + os=-coff
664 + ;;
665 *-tti) # must be before sparc entry or we get the wrong os.
666 os=-sysv3
667 ;;
668 @@ -1240,19 +1358,19 @@
669 *-next)
670 os=-nextstep3
671 ;;
672 - *-gould)
673 + *-gould)
674 os=-sysv
675 ;;
676 - *-highlevel)
677 + *-highlevel)
678 os=-bsd
679 ;;
680 *-encore)
681 os=-bsd
682 ;;
683 - *-sgi)
684 + *-sgi)
685 os=-irix
686 ;;
687 - *-siemens)
688 + *-siemens)
689 os=-sysv4
690 ;;
691 *-masscomp)
692 @@ -1324,7 +1442,7 @@
693 -ptx*)
694 vendor=sequent
695 ;;
696 - -vxsim* | -vxworks*)
697 + -vxsim* | -vxworks* | -windiss*)
698 vendor=wrs
699 ;;
700 -aux*)
701 @@ -1338,6 +1456,9 @@
702 ;;
703 -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
704 vendor=atari
705 + ;;
706 + -vos*)
707 + vendor=stratus
708 ;;
709 esac
710 basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
711 --- SDL_image-1.2.3/IMG_png.c 2001-12-14 08:02:16.000000000 -0500
712 +++ SDL_image-1.2.3-aros/IMG_png.c 2011-03-05 18:22:21.000000000 -0500
713 @@ -138,7 +138,7 @@
714 * the normal method of doing things with libpng). REQUIRED unless you
715 * set up your own error handlers in png_create_read_struct() earlier.
716 */
717 - if ( setjmp(png_ptr->jmpbuf) ) {
718 + if ( setjmp(*png_set_longjmp_fn(png_ptr, longjmp, sizeof (jmp_buf))) ) {
719 IMG_SetError("Error reading the PNG file.");
720 goto done;
721 }
722 @@ -203,13 +203,14 @@
723 /* Allocate the SDL surface to hold the image */
724 Rmask = Gmask = Bmask = Amask = 0 ;
725 if ( color_type != PNG_COLOR_TYPE_PALETTE ) {
726 + int ichannels = png_get_channels(png_ptr, info_ptr);
727 if ( SDL_BYTEORDER == SDL_LIL_ENDIAN ) {
728 Rmask = 0x000000FF;
729 Gmask = 0x0000FF00;
730 Bmask = 0x00FF0000;
731 - Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
732 + Amask = (ichannels == 4) ? 0xFF000000 : 0;
733 } else {
734 - int s = (info_ptr->channels == 4) ? 0 : 8;
735 + int s = (ichannels == 4) ? 0 : 8;
736 Rmask = 0xFF000000 >> s;
737 Gmask = 0x00FF0000 >> s;
738 Bmask = 0x0000FF00 >> s;
739 @@ -217,7 +218,7 @@
740 }
741 }
742 surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
743 - bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask);
744 + bit_depth*png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask);
745 if ( surface == NULL ) {
746 IMG_SetError("Out of memory");
747 goto done;
748 @@ -255,6 +256,9 @@
749 /* Load the palette, if any */
750 palette = surface->format->palette;
751 if ( palette ) {
752 + png_colorp ipalette;
753 + int num_palette;
754 +
755 if(color_type == PNG_COLOR_TYPE_GRAY) {
756 palette->ncolors = 256;
757 for(i = 0; i < 256; i++) {
758 @@ -262,12 +266,12 @@
759 palette->colors[i].g = i;
760 palette->colors[i].b = i;
761 }
762 - } else if (info_ptr->num_palette > 0 ) {
763 - palette->ncolors = info_ptr->num_palette;
764 - for( i=0; i<info_ptr->num_palette; ++i ) {
765 - palette->colors[i].b = info_ptr->palette[i].blue;
766 - palette->colors[i].g = info_ptr->palette[i].green;
767 - palette->colors[i].r = info_ptr->palette[i].red;
768 + } else if (png_get_PLTE(png_ptr, info_ptr, &ipalette, &num_palette)) {
769 + palette->ncolors = num_palette;
770 + for( i=0; i<num_palette; ++i ) {
771 + palette->colors[i].b = ipalette[i].blue;
772 + palette->colors[i].g = ipalette[i].green;
773 + palette->colors[i].r = ipalette[i].red;
774 }
775 }
776 }