nutcracker 0.2.4.1 → 0.2.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (38) hide show
  1. data/README.md +28 -10
  2. data/Rakefile +5 -19
  3. data/bin/nutcracker +6 -1
  4. data/ext/nutcracker/ChangeLog +9 -0
  5. data/ext/nutcracker/Makefile.in +54 -29
  6. data/ext/nutcracker/README.md +13 -11
  7. data/ext/nutcracker/aclocal.m4 +46 -26
  8. data/ext/nutcracker/config/config.guess +209 -240
  9. data/ext/nutcracker/config/config.sub +157 -70
  10. data/ext/nutcracker/config/depcomp +66 -8
  11. data/ext/nutcracker/config/install-sh +18 -11
  12. data/ext/nutcracker/config/ltmain.sh +2632 -1384
  13. data/ext/nutcracker/config/missing +4 -49
  14. data/ext/nutcracker/configure +2866 -2118
  15. data/ext/nutcracker/configure.ac +1 -1
  16. data/ext/nutcracker/contrib/Makefile.in +17 -10
  17. data/ext/nutcracker/m4/libtool.m4 +1437 -812
  18. data/ext/nutcracker/m4/ltoptions.m4 +24 -8
  19. data/ext/nutcracker/m4/ltversion.m4 +6 -6
  20. data/ext/nutcracker/m4/lt~obsolete.m4 +9 -3
  21. data/ext/nutcracker/notes/recommendation.md +21 -2
  22. data/ext/nutcracker/notes/redis.md +9 -9
  23. data/ext/nutcracker/scripts/redis-check.sh +9 -0
  24. data/ext/nutcracker/src/Makefile.in +18 -11
  25. data/ext/nutcracker/src/hashkit/Makefile.am +1 -0
  26. data/ext/nutcracker/src/hashkit/Makefile.in +23 -13
  27. data/ext/nutcracker/src/hashkit/nc_crc16.c +66 -0
  28. data/ext/nutcracker/src/hashkit/nc_hashkit.h +2 -0
  29. data/ext/nutcracker/src/hashkit/nc_modula.c +18 -6
  30. data/ext/nutcracker/src/nc_conf.c +14 -35
  31. data/ext/nutcracker/src/nc_conf.h +1 -1
  32. data/ext/nutcracker/src/nc_message.h +2 -0
  33. data/ext/nutcracker/src/nc_server.c +9 -7
  34. data/ext/nutcracker/src/proto/Makefile.in +16 -9
  35. data/ext/nutcracker/src/proto/nc_redis.c +17 -4
  36. data/lib/nutcracker/version.rb +1 -1
  37. data/lib/nutcracker.rb +60 -2
  38. metadata +3 -2
@@ -1,10 +1,10 @@
1
1
  #! /bin/sh
2
2
  # Configuration validation subroutine script.
3
3
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4
- # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
5
- # Free Software Foundation, Inc.
4
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
5
+ # 2011, 2012 Free Software Foundation, Inc.
6
6
 
7
- timestamp='2009-04-17'
7
+ timestamp='2012-02-10'
8
8
 
9
9
  # This file is (in principle) common to ALL GNU software.
10
10
  # The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@ timestamp='2009-04-17'
21
21
  # GNU General Public License for more details.
22
22
  #
23
23
  # You should have received a copy of the GNU General Public License
24
- # along with this program; if not, write to the Free Software
25
- # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
26
- # 02110-1301, USA.
24
+ # along with this program; if not, see <http://www.gnu.org/licenses/>.
27
25
  #
28
26
  # As a special exception to the GNU General Public License, if you
29
27
  # distribute this file as part of a program that contains a
@@ -32,13 +30,16 @@ timestamp='2009-04-17'
32
30
 
33
31
 
34
32
  # Please send patches to <config-patches@gnu.org>. Submit a context
35
- # diff and a properly formatted ChangeLog entry.
33
+ # diff and a properly formatted GNU ChangeLog entry.
36
34
  #
37
35
  # Configuration subroutine to validate and canonicalize a configuration type.
38
36
  # Supply the specified configuration type as an argument.
39
37
  # If it is invalid, we print an error message on stderr and exit with code 1.
40
38
  # Otherwise, we print the canonical config type on stdout and succeed.
41
39
 
40
+ # You can get the latest version of this script from:
41
+ # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
42
+
42
43
  # This file is supposed to be the same for all GNU packages
43
44
  # and recognize all the CPU types, system types and aliases
44
45
  # that are meaningful with *any* GNU software.
@@ -72,8 +73,9 @@ Report bugs and patches to <config-patches@gnu.org>."
72
73
  version="\
73
74
  GNU config.sub ($timestamp)
74
75
 
75
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
76
- 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
76
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
77
+ 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
78
+ Free Software Foundation, Inc.
77
79
 
78
80
  This is free software; see the source for copying conditions. There is NO
79
81
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -120,13 +122,18 @@ esac
120
122
  # Here we must recognize all the valid KERNEL-OS combinations.
121
123
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
122
124
  case $maybe_os in
123
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
124
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
125
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
126
+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
127
+ knetbsd*-gnu* | netbsd*-gnu* | \
125
128
  kopensolaris*-gnu* | \
126
129
  storm-chaos* | os2-emx* | rtmk-nova*)
127
130
  os=-$maybe_os
128
131
  basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
129
132
  ;;
133
+ android-linux)
134
+ os=-linux-android
135
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
136
+ ;;
130
137
  *)
131
138
  basic_machine=`echo $1 | sed 's/-[^-]*$//'`
132
139
  if [ $basic_machine != $1 ]
@@ -149,10 +156,13 @@ case $os in
149
156
  -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
150
157
  -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
151
158
  -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
152
- -apple | -axis | -knuth | -cray)
159
+ -apple | -axis | -knuth | -cray | -microblaze)
153
160
  os=
154
161
  basic_machine=$1
155
162
  ;;
163
+ -bluegene*)
164
+ os=-cnk
165
+ ;;
156
166
  -sim | -cisco | -oki | -wec | -winbond)
157
167
  os=
158
168
  basic_machine=$1
@@ -167,10 +177,10 @@ case $os in
167
177
  os=-chorusos
168
178
  basic_machine=$1
169
179
  ;;
170
- -chorusrdb)
171
- os=-chorusrdb
180
+ -chorusrdb)
181
+ os=-chorusrdb
172
182
  basic_machine=$1
173
- ;;
183
+ ;;
174
184
  -hiux*)
175
185
  os=-hiuxwe2
176
186
  ;;
@@ -239,17 +249,22 @@ case $basic_machine in
239
249
  # Some are omitted here because they have special meanings below.
240
250
  1750a | 580 \
241
251
  | a29k \
252
+ | aarch64 | aarch64_be \
242
253
  | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
243
254
  | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
244
255
  | am33_2.0 \
245
256
  | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
257
+ | be32 | be64 \
246
258
  | bfin \
247
259
  | c4x | clipper \
248
260
  | d10v | d30v | dlx | dsp16xx \
261
+ | epiphany \
249
262
  | fido | fr30 | frv \
250
263
  | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
264
+ | hexagon \
251
265
  | i370 | i860 | i960 | ia64 \
252
266
  | ip2k | iq2000 \
267
+ | le32 | le64 \
253
268
  | lm32 \
254
269
  | m32c | m32r | m32rle | m68000 | m68k | m88k \
255
270
  | maxq | mb | microblaze | mcore | mep | metag \
@@ -275,27 +290,39 @@ case $basic_machine in
275
290
  | moxie \
276
291
  | mt \
277
292
  | msp430 \
293
+ | nds32 | nds32le | nds32be \
278
294
  | nios | nios2 \
279
295
  | ns16k | ns32k \
296
+ | open8 \
280
297
  | or32 \
281
298
  | pdp10 | pdp11 | pj | pjl \
282
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
299
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
283
300
  | pyramid \
301
+ | rl78 | rx \
284
302
  | score \
285
303
  | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
286
304
  | sh64 | sh64le \
287
305
  | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
288
306
  | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
289
- | spu | strongarm \
290
- | tahoe | thumb | tic4x | tic80 | tron \
291
- | v850 | v850e \
307
+ | spu \
308
+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
309
+ | ubicom32 \
310
+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
292
311
  | we32k \
293
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
312
+ | x86 | xc16x | xstormy16 | xtensa \
294
313
  | z8k | z80)
295
314
  basic_machine=$basic_machine-unknown
296
315
  ;;
297
- m6811 | m68hc11 | m6812 | m68hc12)
298
- # Motorola 68HC11/12.
316
+ c54x)
317
+ basic_machine=tic54x-unknown
318
+ ;;
319
+ c55x)
320
+ basic_machine=tic55x-unknown
321
+ ;;
322
+ c6x)
323
+ basic_machine=tic6x-unknown
324
+ ;;
325
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
299
326
  basic_machine=$basic_machine-unknown
300
327
  os=-none
301
328
  ;;
@@ -305,6 +332,21 @@ case $basic_machine in
305
332
  basic_machine=mt-unknown
306
333
  ;;
307
334
 
335
+ strongarm | thumb | xscale)
336
+ basic_machine=arm-unknown
337
+ ;;
338
+ xgate)
339
+ basic_machine=$basic_machine-unknown
340
+ os=-none
341
+ ;;
342
+ xscaleeb)
343
+ basic_machine=armeb-unknown
344
+ ;;
345
+
346
+ xscaleel)
347
+ basic_machine=armel-unknown
348
+ ;;
349
+
308
350
  # We use `pc' rather than `unknown'
309
351
  # because (1) that's what they normally are, and
310
352
  # (2) the word "unknown" tends to confuse beginning users.
@@ -319,25 +361,29 @@ case $basic_machine in
319
361
  # Recognize the basic CPU types with company name.
320
362
  580-* \
321
363
  | a29k-* \
364
+ | aarch64-* | aarch64_be-* \
322
365
  | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
323
366
  | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
324
367
  | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
325
368
  | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
326
369
  | avr-* | avr32-* \
370
+ | be32-* | be64-* \
327
371
  | bfin-* | bs2000-* \
328
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
372
+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
329
373
  | clipper-* | craynv-* | cydra-* \
330
374
  | d10v-* | d30v-* | dlx-* \
331
375
  | elxsi-* \
332
376
  | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
333
377
  | h8300-* | h8500-* \
334
378
  | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
379
+ | hexagon-* \
335
380
  | i*86-* | i860-* | i960-* | ia64-* \
336
381
  | ip2k-* | iq2000-* \
382
+ | le32-* | le64-* \
337
383
  | lm32-* \
338
384
  | m32c-* | m32r-* | m32rle-* \
339
385
  | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
340
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
386
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
341
387
  | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
342
388
  | mips16-* \
343
389
  | mips64-* | mips64el-* \
@@ -359,24 +405,29 @@ case $basic_machine in
359
405
  | mmix-* \
360
406
  | mt-* \
361
407
  | msp430-* \
408
+ | nds32-* | nds32le-* | nds32be-* \
362
409
  | nios-* | nios2-* \
363
410
  | none-* | np1-* | ns16k-* | ns32k-* \
411
+ | open8-* \
364
412
  | orion-* \
365
413
  | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
366
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
414
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
367
415
  | pyramid-* \
368
- | romp-* | rs6000-* \
416
+ | rl78-* | romp-* | rs6000-* | rx-* \
369
417
  | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
370
418
  | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
371
419
  | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
372
420
  | sparclite-* \
373
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
374
- | tahoe-* | thumb-* \
375
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
421
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
422
+ | tahoe-* \
423
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
424
+ | tile*-* \
376
425
  | tron-* \
377
- | v850-* | v850e-* | vax-* \
426
+ | ubicom32-* \
427
+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
428
+ | vax-* \
378
429
  | we32k-* \
379
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
430
+ | x86-* | x86_64-* | xc16x-* | xps100-* \
380
431
  | xstormy16-* | xtensa*-* \
381
432
  | ymp-* \
382
433
  | z8k-* | z80-*)
@@ -401,7 +452,7 @@ case $basic_machine in
401
452
  basic_machine=a29k-amd
402
453
  os=-udi
403
454
  ;;
404
- abacus)
455
+ abacus)
405
456
  basic_machine=abacus-unknown
406
457
  ;;
407
458
  adobe68k)
@@ -467,11 +518,24 @@ case $basic_machine in
467
518
  basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
468
519
  os=-linux
469
520
  ;;
521
+ bluegene*)
522
+ basic_machine=powerpc-ibm
523
+ os=-cnk
524
+ ;;
525
+ c54x-*)
526
+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
527
+ ;;
528
+ c55x-*)
529
+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
530
+ ;;
531
+ c6x-*)
532
+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
533
+ ;;
470
534
  c90)
471
535
  basic_machine=c90-cray
472
536
  os=-unicos
473
537
  ;;
474
- cegcc)
538
+ cegcc)
475
539
  basic_machine=arm-unknown
476
540
  os=-cegcc
477
541
  ;;
@@ -503,7 +567,7 @@ case $basic_machine in
503
567
  basic_machine=craynv-cray
504
568
  os=-unicosmp
505
569
  ;;
506
- cr16)
570
+ cr16 | cr16-*)
507
571
  basic_machine=cr16-unknown
508
572
  os=-elf
509
573
  ;;
@@ -661,7 +725,6 @@ case $basic_machine in
661
725
  i370-ibm* | ibm*)
662
726
  basic_machine=i370-ibm
663
727
  ;;
664
- # I'm not sure what "Sysv32" means. Should this be sysv3.2?
665
728
  i*86v32)
666
729
  basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
667
730
  os=-sysv32
@@ -719,6 +782,9 @@ case $basic_machine in
719
782
  basic_machine=ns32k-utek
720
783
  os=-sysv
721
784
  ;;
785
+ microblaze)
786
+ basic_machine=microblaze-xilinx
787
+ ;;
722
788
  mingw32)
723
789
  basic_machine=i386-pc
724
790
  os=-mingw32
@@ -755,10 +821,18 @@ case $basic_machine in
755
821
  ms1-*)
756
822
  basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
757
823
  ;;
824
+ msys)
825
+ basic_machine=i386-pc
826
+ os=-msys
827
+ ;;
758
828
  mvs)
759
829
  basic_machine=i370-ibm
760
830
  os=-mvs
761
831
  ;;
832
+ nacl)
833
+ basic_machine=le32-unknown
834
+ os=-nacl
835
+ ;;
762
836
  ncr3000)
763
837
  basic_machine=i486-ncr
764
838
  os=-sysv4
@@ -823,6 +897,12 @@ case $basic_machine in
823
897
  np1)
824
898
  basic_machine=np1-gould
825
899
  ;;
900
+ neo-tandem)
901
+ basic_machine=neo-tandem
902
+ ;;
903
+ nse-tandem)
904
+ basic_machine=nse-tandem
905
+ ;;
826
906
  nsr-tandem)
827
907
  basic_machine=nsr-tandem
828
908
  ;;
@@ -905,9 +985,10 @@ case $basic_machine in
905
985
  ;;
906
986
  power) basic_machine=power-ibm
907
987
  ;;
908
- ppc) basic_machine=powerpc-unknown
988
+ ppc | ppcbe) basic_machine=powerpc-unknown
909
989
  ;;
910
- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
990
+ ppc-* | ppcbe-*)
991
+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
911
992
  ;;
912
993
  ppcle | powerpclittle | ppc-le | powerpc-little)
913
994
  basic_machine=powerpcle-unknown
@@ -1001,6 +1082,9 @@ case $basic_machine in
1001
1082
  basic_machine=i860-stratus
1002
1083
  os=-sysv4
1003
1084
  ;;
1085
+ strongarm-* | thumb-*)
1086
+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
1087
+ ;;
1004
1088
  sun2)
1005
1089
  basic_machine=m68000-sun
1006
1090
  ;;
@@ -1057,20 +1141,8 @@ case $basic_machine in
1057
1141
  basic_machine=t90-cray
1058
1142
  os=-unicos
1059
1143
  ;;
1060
- tic54x | c54x*)
1061
- basic_machine=tic54x-unknown
1062
- os=-coff
1063
- ;;
1064
- tic55x | c55x*)
1065
- basic_machine=tic55x-unknown
1066
- os=-coff
1067
- ;;
1068
- tic6x | c6x*)
1069
- basic_machine=tic6x-unknown
1070
- os=-coff
1071
- ;;
1072
1144
  tile*)
1073
- basic_machine=tile-unknown
1145
+ basic_machine=$basic_machine-unknown
1074
1146
  os=-linux-gnu
1075
1147
  ;;
1076
1148
  tx39)
@@ -1140,6 +1212,9 @@ case $basic_machine in
1140
1212
  xps | xps100)
1141
1213
  basic_machine=xps100-honeywell
1142
1214
  ;;
1215
+ xscale-* | xscalee[bl]-*)
1216
+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
1217
+ ;;
1143
1218
  ymp)
1144
1219
  basic_machine=ymp-cray
1145
1220
  os=-unicos
@@ -1237,9 +1312,12 @@ esac
1237
1312
  if [ x"$os" != x"" ]
1238
1313
  then
1239
1314
  case $os in
1240
- # First match some system type aliases
1241
- # that might get confused with valid system types.
1315
+ # First match some system type aliases
1316
+ # that might get confused with valid system types.
1242
1317
  # -solaris* is a basic system type, with this one exception.
1318
+ -auroraux)
1319
+ os=-auroraux
1320
+ ;;
1243
1321
  -solaris1 | -solaris1.*)
1244
1322
  os=`echo $os | sed -e 's|solaris1|sunos4|'`
1245
1323
  ;;
@@ -1260,9 +1338,9 @@ case $os in
1260
1338
  # Each alternative MUST END IN A *, to match a version number.
1261
1339
  # -sysv* is not here because it comes later, after sysvr4.
1262
1340
  -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1263
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
1264
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
1265
- | -kopensolaris* \
1341
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1342
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1343
+ | -sym* | -kopensolaris* \
1266
1344
  | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1267
1345
  | -aos* | -aros* \
1268
1346
  | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1274,8 +1352,9 @@ case $os in
1274
1352
  | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1275
1353
  | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1276
1354
  | -chorusos* | -chorusrdb* | -cegcc* \
1277
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1278
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
1355
+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1356
+ | -mingw32* | -linux-gnu* | -linux-android* \
1357
+ | -linux-newlib* | -linux-uclibc* \
1279
1358
  | -uxpv* | -beos* | -mpeix* | -udk* \
1280
1359
  | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1281
1360
  | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1283,7 +1362,7 @@ case $os in
1283
1362
  | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1284
1363
  | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1285
1364
  | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1286
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
1365
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
1287
1366
  # Remember, each alternative MUST END IN *, to match a version number.
1288
1367
  ;;
1289
1368
  -qnx*)
@@ -1322,7 +1401,7 @@ case $os in
1322
1401
  -opened*)
1323
1402
  os=-openedition
1324
1403
  ;;
1325
- -os400*)
1404
+ -os400*)
1326
1405
  os=-os400
1327
1406
  ;;
1328
1407
  -wince*)
@@ -1371,7 +1450,7 @@ case $os in
1371
1450
  -sinix*)
1372
1451
  os=-sysv4
1373
1452
  ;;
1374
- -tpf*)
1453
+ -tpf*)
1375
1454
  os=-tpf
1376
1455
  ;;
1377
1456
  -triton*)
@@ -1416,6 +1495,8 @@ case $os in
1416
1495
  -dicos*)
1417
1496
  os=-dicos
1418
1497
  ;;
1498
+ -nacl*)
1499
+ ;;
1419
1500
  -none)
1420
1501
  ;;
1421
1502
  *)
@@ -1438,10 +1519,10 @@ else
1438
1519
  # system, and we'll never get to this point.
1439
1520
 
1440
1521
  case $basic_machine in
1441
- score-*)
1522
+ score-*)
1442
1523
  os=-elf
1443
1524
  ;;
1444
- spu-*)
1525
+ spu-*)
1445
1526
  os=-elf
1446
1527
  ;;
1447
1528
  *-acorn)
@@ -1453,8 +1534,17 @@ case $basic_machine in
1453
1534
  arm*-semi)
1454
1535
  os=-aout
1455
1536
  ;;
1456
- c4x-* | tic4x-*)
1457
- os=-coff
1537
+ c4x-* | tic4x-*)
1538
+ os=-coff
1539
+ ;;
1540
+ tic54x-*)
1541
+ os=-coff
1542
+ ;;
1543
+ tic55x-*)
1544
+ os=-coff
1545
+ ;;
1546
+ tic6x-*)
1547
+ os=-coff
1458
1548
  ;;
1459
1549
  # This must come before the *-dec entry.
1460
1550
  pdp10-*)
@@ -1474,14 +1564,11 @@ case $basic_machine in
1474
1564
  ;;
1475
1565
  m68000-sun)
1476
1566
  os=-sunos3
1477
- # This also exists in the configure program, but was not the
1478
- # default.
1479
- # os=-sunos4
1480
1567
  ;;
1481
1568
  m68*-cisco)
1482
1569
  os=-aout
1483
1570
  ;;
1484
- mep-*)
1571
+ mep-*)
1485
1572
  os=-elf
1486
1573
  ;;
1487
1574
  mips*-cisco)
@@ -1508,7 +1595,7 @@ case $basic_machine in
1508
1595
  *-ibm)
1509
1596
  os=-aix
1510
1597
  ;;
1511
- *-knuth)
1598
+ *-knuth)
1512
1599
  os=-mmixware
1513
1600
  ;;
1514
1601
  *-wec)
@@ -1613,7 +1700,7 @@ case $basic_machine in
1613
1700
  -sunos*)
1614
1701
  vendor=sun
1615
1702
  ;;
1616
- -aix*)
1703
+ -cnk*|-aix*)
1617
1704
  vendor=ibm
1618
1705
  ;;
1619
1706
  -beos*)
@@ -1,10 +1,10 @@
1
1
  #! /bin/sh
2
2
  # depcomp - compile a program generating dependencies as side-effects
3
3
 
4
- scriptversion=2009-04-28.21; # UTC
4
+ scriptversion=2011-12-04.11; # UTC
5
5
 
6
- # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
7
- # Software Foundation, Inc.
6
+ # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
7
+ # 2011 Free Software Foundation, Inc.
8
8
 
9
9
  # This program is free software; you can redistribute it and/or modify
10
10
  # it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@ Environment variables:
44
44
  object Object file output by `PROGRAMS ARGS'.
45
45
  DEPDIR directory where to store dependencies.
46
46
  depfile Dependency file to output.
47
- tmpdepfile Temporary file to use when outputing dependencies.
47
+ tmpdepfile Temporary file to use when outputting dependencies.
48
48
  libtool Whether libtool is used (yes/no).
49
49
 
50
50
  Report bugs to <bug-automake@gnu.org>.
@@ -90,10 +90,18 @@ if test "$depmode" = msvcmsys; then
90
90
  # This is just like msvisualcpp but w/o cygpath translation.
91
91
  # Just convert the backslash-escaped backslashes to single forward
92
92
  # slashes to satisfy depend.m4
93
- cygpath_u="sed s,\\\\\\\\,/,g"
93
+ cygpath_u='sed s,\\\\,/,g'
94
94
  depmode=msvisualcpp
95
95
  fi
96
96
 
97
+ if test "$depmode" = msvc7msys; then
98
+ # This is just like msvc7 but w/o cygpath translation.
99
+ # Just convert the backslash-escaped backslashes to single forward
100
+ # slashes to satisfy depend.m4
101
+ cygpath_u='sed s,\\\\,/,g'
102
+ depmode=msvc7
103
+ fi
104
+
97
105
  case "$depmode" in
98
106
  gcc3)
99
107
  ## gcc 3 implements dependency tracking that does exactly what
@@ -158,10 +166,12 @@ gcc)
158
166
  ' < "$tmpdepfile" |
159
167
  ## Some versions of gcc put a space before the `:'. On the theory
160
168
  ## that the space means something, we add a space to the output as
161
- ## well.
169
+ ## well. hp depmode also adds that space, but also prefixes the VPATH
170
+ ## to the object. Take care to not repeat it in the output.
162
171
  ## Some versions of the HPUX 10.20 sed can't process this invocation
163
172
  ## correctly. Breaking it into two sed invocations is a workaround.
164
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
173
+ sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
174
+ | sed -e 's/$/ :/' >> "$depfile"
165
175
  rm -f "$tmpdepfile"
166
176
  ;;
167
177
 
@@ -405,6 +415,52 @@ tru64)
405
415
  rm -f "$tmpdepfile"
406
416
  ;;
407
417
 
418
+ msvc7)
419
+ if test "$libtool" = yes; then
420
+ showIncludes=-Wc,-showIncludes
421
+ else
422
+ showIncludes=-showIncludes
423
+ fi
424
+ "$@" $showIncludes > "$tmpdepfile"
425
+ stat=$?
426
+ grep -v '^Note: including file: ' "$tmpdepfile"
427
+ if test "$stat" = 0; then :
428
+ else
429
+ rm -f "$tmpdepfile"
430
+ exit $stat
431
+ fi
432
+ rm -f "$depfile"
433
+ echo "$object : \\" > "$depfile"
434
+ # The first sed program below extracts the file names and escapes
435
+ # backslashes for cygpath. The second sed program outputs the file
436
+ # name when reading, but also accumulates all include files in the
437
+ # hold buffer in order to output them again at the end. This only
438
+ # works with sed implementations that can handle large buffers.
439
+ sed < "$tmpdepfile" -n '
440
+ /^Note: including file: *\(.*\)/ {
441
+ s//\1/
442
+ s/\\/\\\\/g
443
+ p
444
+ }' | $cygpath_u | sort -u | sed -n '
445
+ s/ /\\ /g
446
+ s/\(.*\)/ \1 \\/p
447
+ s/.\(.*\) \\/\1:/
448
+ H
449
+ $ {
450
+ s/.*/ /
451
+ G
452
+ p
453
+ }' >> "$depfile"
454
+ rm -f "$tmpdepfile"
455
+ ;;
456
+
457
+ msvc7msys)
458
+ # This case exists only to let depend.m4 do its work. It works by
459
+ # looking at the text of this script. This case will never be run,
460
+ # since it is checked for above.
461
+ exit 1
462
+ ;;
463
+
408
464
  #nosideeffect)
409
465
  # This comment above is used by automake to tell side-effect
410
466
  # dependency tracking mechanisms from slower ones.
@@ -503,7 +559,9 @@ makedepend)
503
559
  touch "$tmpdepfile"
504
560
  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
505
561
  rm -f "$depfile"
506
- cat < "$tmpdepfile" > "$depfile"
562
+ # makedepend may prepend the VPATH from the source file name to the object.
563
+ # No need to regex-escape $object, excess matching of '.' is harmless.
564
+ sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
507
565
  sed '1,2d' "$tmpdepfile" | tr ' ' '
508
566
  ' | \
509
567
  ## Some versions of the HPUX 10.20 sed can't process this invocation