-
Notifications
You must be signed in to change notification settings - Fork 3
/
binutils-2.18.diff
17008 lines (15960 loc) · 481 KB
/
binutils-2.18.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
patch against binutils-2.18 in order to enable building the
libbfd, libiberty and libopcodes libraries for an RTEMS host:
o remove most unneeded stuff from libiberty -- some of it
would actually clash with what's already in newlib/rtems.
o don't recurse into the binutils, gas, gprof, intl and ld
subdirectories.
o for RTEMS, use only ELF target vectors (ppc,i386 + m68k)
this hopefully reduces the size somewhat.
o do not install libiberty into a multilib subdirectory.
No other part of binutils can be built as multilibs
and the 'strange' install location of libiberty will
confuse application makefiles which expects it in the
same place where libbfd etc. reside.
NOTE: if you want to try this patch on any other version of binutils
then the pieces that patch the 'configure' files
binutils-2.18/configure
binutils-2.18/libiberty/configure
most likely will fail. If you have autoconf then you can simply
ignore the failure and create the 'configure' files from the
(patched) configure.ac by running
(cd binutils-2.18; autoconf)
(cd binutils-2.18/libiberty; autoconf)
This patch also modifies the 'configure' files for your convenience
so that you don't have to run autoconf when using binutils-2.18.
To apply this patch, chdir to the directory containing binutils-2.18
and issue (it is always a good idea to run with the --dry-run option first)
patch -p0 -b < <this file>
Till Straumann, 4/2008
diff -crN binutils-2.18.orig/bfd/config.bfd binutils-2.18/bfd/config.bfd
*** binutils-2.18.orig/bfd/config.bfd 2007-08-28 10:19:33.000000000 -0700
--- binutils-2.18/bfd/config.bfd 2008-10-06 11:22:47.000000000 -0700
***************
*** 512,518 ****
;;
i[3-7]86-*-rtems*)
targ_defvec=bfd_elf32_i386_vec
! targ_selvecs="i386coff_vec i386aout_vec"
;;
i[3-7]86-*-darwin* | i[3-7]86-*-macos10* | i[3-7]86-*-rhapsody*)
targ_defvec=mach_o_le_vec
--- 512,518 ----
;;
i[3-7]86-*-rtems*)
targ_defvec=bfd_elf32_i386_vec
! # targ_selvecs="i386coff_vec i386aout_vec"
;;
i[3-7]86-*-darwin* | i[3-7]86-*-macos10* | i[3-7]86-*-rhapsody*)
targ_defvec=mach_o_le_vec
***************
*** 753,759 ****
;;
m68*-*-rtems*)
targ_defvec=bfd_elf32_m68k_vec
! targ_selvecs="m68kcoff_vec versados_vec ieee_vec aout0_big_vec"
;;
m68*-*-coff* | m68*-*-sysv*)
targ_defvec=m68kcoff_vec
--- 753,759 ----
;;
m68*-*-rtems*)
targ_defvec=bfd_elf32_m68k_vec
! # targ_selvecs="m68kcoff_vec versados_vec ieee_vec aout0_big_vec"
;;
m68*-*-coff* | m68*-*-sysv*)
targ_defvec=m68kcoff_vec
***************
*** 1089,1095 ****
powerpc-*-solaris2* | powerpc-*-linux-* | powerpc-*-rtems* | \
powerpc-*-chorus*)
targ_defvec=bfd_elf32_powerpc_vec
! targ_selvecs="rs6000coff_vec bfd_elf32_powerpcle_vec ppcboot_vec"
targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec"
;;
powerpc-*-kaos*)
--- 1089,1095 ----
powerpc-*-solaris2* | powerpc-*-linux-* | powerpc-*-rtems* | \
powerpc-*-chorus*)
targ_defvec=bfd_elf32_powerpc_vec
! # targ_selvecs="rs6000coff_vec bfd_elf32_powerpcle_vec ppcboot_vec"
targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec"
;;
powerpc-*-kaos*)
diff -crN binutils-2.18.orig/configure binutils-2.18/configure
*** binutils-2.18.orig/configure 2007-08-06 13:29:40.000000000 -0700
--- binutils-2.18/configure 2008-10-06 11:22:47.000000000 -0700
***************
*** 2175,2180 ****
--- 2175,2181 ----
;;
*-*-rtems*)
noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
+ skipdirs="$skipdirs binutils gas gprof intl ld"
;;
# The tpf target doesn't support gdb yet.
*-*-tpf*)
***************
*** 6128,6134 ****
# For an installed makeinfo, we require it to be from texinfo 4.4 or
# higher, else we use the "missing" dummy.
if ${MAKEINFO} --version \
! | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
:
else
MAKEINFO="$MISSING makeinfo"
--- 6129,6135 ----
# For an installed makeinfo, we require it to be from texinfo 4.4 or
# higher, else we use the "missing" dummy.
if ${MAKEINFO} --version \
! | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
:
else
MAKEINFO="$MISSING makeinfo"
diff -crN binutils-2.18.orig/configure.ac binutils-2.18/configure.ac
*** binutils-2.18.orig/configure.ac 2007-08-28 13:24:26.000000000 -0700
--- binutils-2.18/configure.ac 2008-10-06 11:22:47.000000000 -0700
***************
*** 453,458 ****
--- 453,459 ----
;;
*-*-rtems*)
noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
+ skipdirs="$skipdirs binutils gas gprof intl ld"
;;
# The tpf target doesn't support gdb yet.
*-*-tpf*)
***************
*** 2403,2409 ****
# For an installed makeinfo, we require it to be from texinfo 4.4 or
# higher, else we use the "missing" dummy.
if ${MAKEINFO} --version \
! | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
:
else
MAKEINFO="$MISSING makeinfo"
--- 2404,2410 ----
# For an installed makeinfo, we require it to be from texinfo 4.4 or
# higher, else we use the "missing" dummy.
if ${MAKEINFO} --version \
! | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
:
else
MAKEINFO="$MISSING makeinfo"
diff -crN binutils-2.18.orig/configure.gnu binutils-2.18/configure.gnu
*** binutils-2.18.orig/configure.gnu 1969-12-31 16:00:00.000000000 -0800
--- binutils-2.18/configure.gnu 2008-10-06 12:12:48.000000000 -0700
***************
*** 0 ****
--- 1,39 ----
+ #!/bin/sh
+ # wrapper script to strip --enable-maintainer-mode; the binutils
+ # use older autotools than the one we use for ssrlApps so we
+ # don't want to touch the stuff in binutils...
+ script=$0
+
+ while :
+ do
+
+ # Break out if there are no more args
+ case $# in
+ 0)
+ break
+ ;;
+ esac
+
+ # Get the first arg, and shuffle
+ option=$1
+ shift
+ optarg=`expr "x$option" : 'x[^=]*=\(.*\)'`
+
+ orig_option=$option # Save original for error messages
+ case $option in
+ *-enable-maintainer-mode*)
+ option=
+ ;;
+ *)
+ ;;
+ esac
+ echo option "$option"
+
+ args="$args '$option'"
+
+ done
+
+ args="$args --disable-nls"
+
+ echo running /bin/sh `dirname $script`/configure $args
+ exec sh -c "`dirname $script`/configure $args"
diff -crN binutils-2.18.orig/libiberty/configure binutils-2.18/libiberty/configure
*** binutils-2.18.orig/libiberty/configure 2007-08-06 12:59:45.000000000 -0700
--- binutils-2.18/libiberty/configure 2008-10-06 11:22:47.000000000 -0700
***************
*** 1,25 ****
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.59.
#
! # Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
## M4sh Initialization. ##
## --------------------- ##
! # Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
! elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
! set -o posix
fi
- DUALCASE=1; export DUALCASE # for MKS sh
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
--- 1,54 ----
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.61.
#
! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
! # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
## M4sh Initialization. ##
## --------------------- ##
! # Be more Bourne compatible
! DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
! setopt NO_GLOB_SUBST
! else
! case `(set -o) 2>/dev/null` in
! *posix*) set -o posix ;;
! esac
!
! fi
!
!
!
!
! # PATH needs CR
! # Avoid depending upon Character Ranges.
! as_cr_letters='abcdefghijklmnopqrstuvwxyz'
! as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
! as_cr_Letters=$as_cr_letters$as_cr_LETTERS
! as_cr_digits='0123456789'
! as_cr_alnum=$as_cr_Letters$as_cr_digits
!
! # The user is always right.
! if test "${PATH_SEPARATOR+set}" != set; then
! echo "#! /bin/sh" >conf$$.sh
! echo "exit 0" >>conf$$.sh
! chmod +x conf$$.sh
! if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
! PATH_SEPARATOR=';'
! else
! PATH_SEPARATOR=:
! fi
! rm -f conf$$.sh
fi
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
***************
*** 29,36 ****
fi
# Work around bugs in pre-3.0 UWIN ksh.
! $as_unset ENV MAIL MAILPATH
PS1='$ '
PS2='> '
PS4='+ '
--- 58,100 ----
fi
+ # IFS
+ # We need space, tab and new line, in precisely that order. Quoting is
+ # there to prevent editors from complaining about space-tab.
+ # (If _AS_PATH_WALK were called with IFS unset, it would disable word
+ # splitting by setting IFS to empty value.)
+ as_nl='
+ '
+ IFS=" "" $as_nl"
+
+ # Find who we are. Look in the path if we contain no directory separator.
+ case $0 in
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
+ IFS=$as_save_IFS
+
+ ;;
+ esac
+ # We did not find ourselves, most probably we were run as `sh COMMAND'
+ # in which case we are not to be found in the path.
+ if test "x$as_myself" = x; then
+ as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ { (exit 1); exit 1; }
+ fi
+
# Work around bugs in pre-3.0 UWIN ksh.
! for as_var in ENV MAIL MAILPATH
! do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
! done
PS1='$ '
PS2='> '
PS4='+ '
***************
*** 44,61 ****
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
! $as_unset $as_var
fi
done
# Required to use basename.
! if expr a : '\(a\)' >/dev/null 2>&1; then
as_expr=expr
else
as_expr=false
fi
! if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
as_basename=basename
else
as_basename=false
--- 108,126 ----
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
! ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
fi
done
# Required to use basename.
! if expr a : '\(a\)' >/dev/null 2>&1 &&
! test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
else
as_expr=false
fi
! if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
as_basename=basename
else
as_basename=false
***************
*** 63,219 ****
# Name of the executable.
! as_me=`$as_basename "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
! X"$0" : 'X\(/\)$' \| \
! . : '\(.\)' 2>/dev/null ||
echo X/"$0" |
! sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
! /^X\/\(\/\/\)$/{ s//\1/; q; }
! /^X\/\(\/\).*/{ s//\1/; q; }
! s/.*/./; q'`
- # PATH needs CR, and LINENO needs CR and PATH.
- # Avoid depending upon Character Ranges.
- as_cr_letters='abcdefghijklmnopqrstuvwxyz'
- as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
- as_cr_Letters=$as_cr_letters$as_cr_LETTERS
- as_cr_digits='0123456789'
- as_cr_alnum=$as_cr_Letters$as_cr_digits
! # The user is always right.
! if test "${PATH_SEPARATOR+set}" != set; then
! echo "#! /bin/sh" >conf$$.sh
! echo "exit 0" >>conf$$.sh
! chmod +x conf$$.sh
! if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
! PATH_SEPARATOR=';'
! else
! PATH_SEPARATOR=:
! fi
! rm -f conf$$.sh
fi
! as_lineno_1=$LINENO
! as_lineno_2=$LINENO
! as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
! test "x$as_lineno_1" != "x$as_lineno_2" &&
! test "x$as_lineno_3" = "x$as_lineno_2" || {
! # Find who we are. Look in the path if we contain no path at all
! # relative or not.
! case $0 in
! *[\\/]* ) as_myself=$0 ;;
! *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
! for as_dir in $PATH
! do
! IFS=$as_save_IFS
! test -z "$as_dir" && as_dir=.
! test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
! done
! ;;
! esac
! # We did not find ourselves, most probably we were run as `sh COMMAND'
! # in which case we are not to be found in the path.
! if test "x$as_myself" = x; then
! as_myself=$0
! fi
! if test ! -f "$as_myself"; then
! { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
! { (exit 1); exit 1; }; }
! fi
! case $CONFIG_SHELL in
! '')
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
! for as_base in sh bash ksh sh5; do
! case $as_dir in
/*)
! if ("$as_dir/$as_base" -c '
as_lineno_1=$LINENO
as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
test "x$as_lineno_1" != "x$as_lineno_2" &&
! test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
! $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
! $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
! CONFIG_SHELL=$as_dir/$as_base
! export CONFIG_SHELL
! exec "$CONFIG_SHELL" "$0" ${1+"$@"}
! fi;;
! esac
! done
! done
! ;;
! esac
# Create $as_me.lineno as a copy of $as_myself, but with $LINENO
# uniformly replaced by the line number. The first 'sed' inserts a
! # line-number line before each line; the second 'sed' does the real
! # work. The second script uses 'N' to pair each line-number line
! # with the numbered line, and appends trailing '-' during
! # substitution so that $LINENO is not a special case at line end.
# (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
! # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
! sed '=' <$as_myself |
sed '
N
! s,$,-,
! : loop
! s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
t loop
! s,-$,,
! s,^['$as_cr_digits']*\n,,
' >$as_me.lineno &&
! chmod +x $as_me.lineno ||
{ echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
! # original and so on. Autoconf is especially sensible to this).
! . ./$as_me.lineno
# Exit status is that of the last command.
exit
}
! case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
! *c*,-n*) ECHO_N= ECHO_C='
! ' ECHO_T=' ' ;;
! *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
! *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
esac
! if expr a : '\(a\)' >/dev/null 2>&1; then
as_expr=expr
else
as_expr=false
fi
rm -f conf$$ conf$$.exe conf$$.file
echo >conf$$.file
if ln -s conf$$.file conf$$ 2>/dev/null; then
! # We could just check for DJGPP; but this test a) works b) is more generic
! # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
! if test -f conf$$.exe; then
! # Don't use ln at all; we don't have any links
as_ln_s='cp -p'
- else
- as_ln_s='ln -s'
- fi
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
as_ln_s='cp -p'
fi
! rm -f conf$$ conf$$.exe conf$$.file
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
--- 128,515 ----
# Name of the executable.
! as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
! X"$0" : 'X\(/\)' \| . 2>/dev/null ||
echo X/"$0" |
! sed '/^.*\/\([^/][^/]*\)\/*$/{
! s//\1/
! q
! }
! /^X\/\(\/\/\)$/{
! s//\1/
! q
! }
! /^X\/\(\/\).*/{
! s//\1/
! q
! }
! s/.*/./; q'`
+ # CDPATH.
+ $as_unset CDPATH
! if test "x$CONFIG_SHELL" = x; then
! if (eval ":") 2>/dev/null; then
! as_have_required=yes
! else
! as_have_required=no
fi
+ if test $as_have_required = yes && (eval ":
+ (as_func_return () {
+ (exit \$1)
+ }
+ as_func_success () {
+ as_func_return 0
+ }
+ as_func_failure () {
+ as_func_return 1
+ }
+ as_func_ret_success () {
+ return 0
+ }
+ as_func_ret_failure () {
+ return 1
+ }
! exitcode=0
! if as_func_success; then
! :
! else
! exitcode=1
! echo as_func_success failed.
! fi
! if as_func_failure; then
! exitcode=1
! echo as_func_failure succeeded.
! fi
!
! if as_func_ret_success; then
! :
! else
! exitcode=1
! echo as_func_ret_success failed.
! fi
!
! if as_func_ret_failure; then
! exitcode=1
! echo as_func_ret_failure succeeded.
! fi
!
! if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
! :
! else
! exitcode=1
! echo positional parameters were not saved.
! fi
!
! test \$exitcode = 0) || { (exit 1); exit 1; }
!
! (
! as_lineno_1=\$LINENO
! as_lineno_2=\$LINENO
! test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
! test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
! ") 2> /dev/null; then
! :
! else
! as_candidate_shells=
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
! case $as_dir in
/*)
! for as_base in sh bash ksh sh5; do
! as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
! done;;
! esac
! done
! IFS=$as_save_IFS
!
!
! for as_shell in $as_candidate_shells $SHELL; do
! # Try only shells that exist, to save several forks.
! if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
! { ("$as_shell") 2> /dev/null <<\_ASEOF
! if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
! emulate sh
! NULLCMD=:
! # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
! # is contrary to our usage. Disable this feature.
! alias -g '${1+"$@"}'='"$@"'
! setopt NO_GLOB_SUBST
! else
! case `(set -o) 2>/dev/null` in
! *posix*) set -o posix ;;
! esac
!
! fi
!
!
! :
! _ASEOF
! }; then
! CONFIG_SHELL=$as_shell
! as_have_required=yes
! if { "$as_shell" 2> /dev/null <<\_ASEOF
! if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
! emulate sh
! NULLCMD=:
! # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
! # is contrary to our usage. Disable this feature.
! alias -g '${1+"$@"}'='"$@"'
! setopt NO_GLOB_SUBST
! else
! case `(set -o) 2>/dev/null` in
! *posix*) set -o posix ;;
! esac
!
! fi
!
!
! :
! (as_func_return () {
! (exit $1)
! }
! as_func_success () {
! as_func_return 0
! }
! as_func_failure () {
! as_func_return 1
! }
! as_func_ret_success () {
! return 0
! }
! as_func_ret_failure () {
! return 1
! }
!
! exitcode=0
! if as_func_success; then
! :
! else
! exitcode=1
! echo as_func_success failed.
! fi
!
! if as_func_failure; then
! exitcode=1
! echo as_func_failure succeeded.
! fi
!
! if as_func_ret_success; then
! :
! else
! exitcode=1
! echo as_func_ret_success failed.
! fi
!
! if as_func_ret_failure; then
! exitcode=1
! echo as_func_ret_failure succeeded.
! fi
!
! if ( set x; as_func_ret_success y && test x = "$1" ); then
! :
! else
! exitcode=1
! echo positional parameters were not saved.
! fi
!
! test $exitcode = 0) || { (exit 1); exit 1; }
!
! (
as_lineno_1=$LINENO
as_lineno_2=$LINENO
test "x$as_lineno_1" != "x$as_lineno_2" &&
! test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
!
! _ASEOF
! }; then
! break
! fi
!
! fi
!
! done
!
! if test "x$CONFIG_SHELL" != x; then
! for as_var in BASH_ENV ENV
! do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
! done
! export CONFIG_SHELL
! exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
! fi
!
!
! if test $as_have_required = no; then
! echo This script requires a shell more modern than all the
! echo shells that I found on your system. Please install a
! echo modern shell, or manually run the script under such a
! echo shell if you do have one.
! { (exit 1); exit 1; }
! fi
!
!
! fi
!
! fi
!
!
!
! (eval "as_func_return () {
! (exit \$1)
! }
! as_func_success () {
! as_func_return 0
! }
! as_func_failure () {
! as_func_return 1
! }
! as_func_ret_success () {
! return 0
! }
! as_func_ret_failure () {
! return 1
! }
!
! exitcode=0
! if as_func_success; then
! :
! else
! exitcode=1
! echo as_func_success failed.
! fi
!
! if as_func_failure; then
! exitcode=1
! echo as_func_failure succeeded.
! fi
!
! if as_func_ret_success; then
! :
! else
! exitcode=1
! echo as_func_ret_success failed.
! fi
!
! if as_func_ret_failure; then
! exitcode=1
! echo as_func_ret_failure succeeded.
! fi
!
! if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
! :
! else
! exitcode=1
! echo positional parameters were not saved.
! fi
!
! test \$exitcode = 0") || {
! echo No shell found that supports shell functions.
! echo Please tell autoconf@gnu.org about your system,
! echo including any error possibly output before this
! echo message
! }
!
!
!
! as_lineno_1=$LINENO
! as_lineno_2=$LINENO
! test "x$as_lineno_1" != "x$as_lineno_2" &&
! test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
# Create $as_me.lineno as a copy of $as_myself, but with $LINENO
# uniformly replaced by the line number. The first 'sed' inserts a
! # line-number line after each line using $LINENO; the second 'sed'
! # does the real work. The second script uses 'N' to pair each
! # line-number line with the line containing $LINENO, and appends
! # trailing '-' during substitution so that $LINENO is not a special
! # case at line end.
# (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
! # scripts with optimization help from Paolo Bonzini. Blame Lee
! # E. McMahon (1931-1989) for sed's syntax. :-)
! sed -n '
! p
! /[$]LINENO/=
! ' <$as_myself |
sed '
+ s/[$]LINENO.*/&-/
+ t lineno
+ b
+ :lineno
N
! :loop
! s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
t loop
! s/-\n.*//
' >$as_me.lineno &&
! chmod +x "$as_me.lineno" ||
{ echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
! # original and so on. Autoconf is especially sensitive to this).
! . "./$as_me.lineno"
# Exit status is that of the last command.
exit
}
! if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
! as_dirname=dirname
! else
! as_dirname=false
! fi
!
! ECHO_C= ECHO_N= ECHO_T=
! case `echo -n x` in
! -n*)
! case `echo 'x\c'` in
! *c*) ECHO_T=' ';; # ECHO_T is single tab character.
! *) ECHO_C='\c';;
! esac;;
! *)
! ECHO_N='-n';;
esac
! if expr a : '\(a\)' >/dev/null 2>&1 &&
! test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
else
as_expr=false
fi
rm -f conf$$ conf$$.exe conf$$.file
+ if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
+ else
+ rm -f conf$$.dir
+ mkdir conf$$.dir
+ fi
echo >conf$$.file
if ln -s conf$$.file conf$$ 2>/dev/null; then
! as_ln_s='ln -s'
! # ... but there are two gotchas:
! # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
! # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
! # In both cases, we have to default to `cp -p'.
! ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
as_ln_s='cp -p'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
as_ln_s='cp -p'
fi
! rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
! rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
***************
*** 222,228 ****
as_mkdir_p=false
fi
! as_executable_p="test -f"
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
--- 518,545 ----
as_mkdir_p=false
fi
! if test -x / >/dev/null 2>&1; then
! as_test_x='test -x'
! else
! if ls -dL / >/dev/null 2>&1; then
! as_ls_L_option=L
! else
! as_ls_L_option=
! fi
! as_test_x='
! eval sh -c '\''
! if test -d "$1"; then
! test -d "$1/.";
! else
! case $1 in
! -*)set "./$1";;
! esac;
! case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
! ???[sx]*):;;*)false;;esac;fi
! '\'' sh
! '
! fi
! as_executable_p=$as_test_x
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
***************
*** 231,269 ****
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
- # IFS
- # We need space, tab and new line, in precisely that order.
- as_nl='
- '
- IFS=" $as_nl"
-
- # CDPATH.
- $as_unset CDPATH
# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
- exec 6>&1
-
#
# Initializations.
#
ac_default_prefix=/usr/local
ac_config_libobj_dir=.
cross_compiling=no
subdirs=
MFLAGS=
MAKEFLAGS=
SHELL=${CONFIG_SHELL-/bin/sh}
- # Maximum number of lines to put in a shell here document.
- # This variable seems obsolete. It should probably be removed, and
- # only ac_max_sed_lines should be used.
- : ${ac_max_here_lines=38}
-